diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog
index 3bf90bff4..273e0da7f 100644
--- a/winsup/utils/ChangeLog
+++ b/winsup/utils/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 10 19:08:58 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* Makefile.in: Compile/link dumper.exe with c++.
+
 Tue Dec  7 11:15:00 2000  Corinna Vinschen <corinna@vinschen.de>
 
 	* mkpasswd.c: Slight formatting changes to the below patch.
diff --git a/winsup/utils/Makefile.in b/winsup/utils/Makefile.in
index 4b49e87d1..c5e5855b0 100644
--- a/winsup/utils/Makefile.in
+++ b/winsup/utils/Makefile.in
@@ -31,7 +31,7 @@ CXX:=@CXX@
 CXX_FOR_TARGET:=$(CXX)
 
 CFLAGS:=@CFLAGS@
-CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -nostdinc++ -fno-rtti
+CXXFLAGS:=@CXXFLAGS@ -fno-exceptions -fno-rtti
 
 include $(srcdir)/../Makefile.common
 
@@ -97,27 +97,27 @@ endif
 
 dumper.o: dumper.cc dumper.h
 ifdef VERBOSE
-	$(COMPILE_CC) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
+	$(COMPILE_CXX) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
 else
-	@echo $(CC) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
-	$(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
+	@echo $(CXX) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
+	$(COMPILE_CXX) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
 endif
 
 
 module_info.o: module_info.cc
 ifdef VERBOSE
-	$(COMPILE_CC) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
+	$(COMPILE_CXX) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
 else
-	@echo $(CC) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
-	$(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
+	@echo $(CXX) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
+	$(COMPILE_CXX) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
 endif
 
 parse_pe.o: parse_pe.cc dumper.h
 ifdef VERBOSE
-	$(COMPILE_CC) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
+	$(COMPILE_CXX) $c -o $@ $(DUMPER_INCLUDES) ${firstword $^}
 else
-	@echo $(CC) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
-	$(COMPILE_CC) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
+	@echo $(CXX) $c $(CFLAGS) $(DUMPER_INCLUDES) ... $(basename $@).cc;\
+	$(COMPILE_CXX) $c -o $(@D)/$(basename $@)$o $(DUMPER_INCLUDES) $<
 endif
 
 mingw_getopt.o: $(cygwin_source)/lib/getopt.c