diff --git a/libstdc++/ChangeLog b/libstdc++/ChangeLog
index d51fb29428f..cdd427e6824 100644
--- a/libstdc++/ChangeLog
+++ b/libstdc++/ChangeLog
@@ -1,3 +1,8 @@
+1999-12-15  Jason Merrill  <jason@casey.cygnus.com>
+
+	* Makefile.in (MYCXXFLAGS): Include $(CXXFLAGS).
+	(MYCFLAGS): Include $(CFLAGS).
+	
 1999-12-14  Martin v. Löwis  <loewis@informatik.hu-berlin.de>
 
 	* std/bastring.h (basic_string::basic_string): Rename parameters
diff --git a/libstdc++/Makefile.in b/libstdc++/Makefile.in
index 4668344ca05..1b5c85a6fb6 100644
--- a/libstdc++/Makefile.in
+++ b/libstdc++/Makefile.in
@@ -367,8 +367,8 @@ install:
 .PHONY: force
 force:
 
-MYCXXFLAGS = -g -O2 -Wpointer-arith -Wnested-externs -Woverloaded-virtual -Wbad-function-cast -Winline -Wwrite-strings -pedantic -Wno-long-long
-MYCFLAGS = -g -O2 -Wpointer-arith -Wnested-externs
+MYCXXFLAGS = $(CXXFLAGS) -g -O2 -Wpointer-arith -Wnested-externs -Woverloaded-virtual -Wbad-function-cast -Winline -Wwrite-strings -pedantic -Wno-long-long
+MYCFLAGS = $(CFLAGS) -g -O2 -Wpointer-arith -Wnested-externs
 
 .PHONY: stuff
 stuff: