diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index eec608de5..9d6e74a9c 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,5 +1,7 @@
 2004-07-13  Earnie Boyd  <earnie@users.sourcefourge.net>
 
+	* Makefile.in: Move use of --nostdinc++ as GCC3.4 refuses to use it
+	for C modules.
 	* include/limits.h: Change to new file header preamble.
 	* include/_mingw.h: Increment minor version for 3.4 release.
 	* Makefile.in: Ditto.
diff --git a/winsup/mingw/Makefile.in b/winsup/mingw/Makefile.in
index c9c6235a3..66b6c3aac 100644
--- a/winsup/mingw/Makefile.in
+++ b/winsup/mingw/Makefile.in
@@ -100,10 +100,10 @@ LIBM_A=@LIBM_A@
 W32API_INCLUDE = @W32API_INCLUDE@
 INCLUDES+= -I$(srcdir)/include \
   -I$(srcdir)/../include \
-  -nostdinc -nostdinc++ \
+  -nostdinc \
   -iwithprefixbefore include
 ALL_CFLAGS = $(CFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
-ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) $(MNO_CYGWIN)
+ALL_CXXFLAGS = $(CXXFLAGS) $(W32API_INCLUDE) $(INCLUDES) -nostdinc++ $(MNO_CYGWIN)
 
 AS = @AS@
 AR = @AR@