diff --git a/gas/ChangeLog b/gas/ChangeLog
index 115ff4d536d..0de17bd57da 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 16 15:47:24 1997  Ian Lance Taylor  <ian@cygnus.com>
+
+	* Makefile.in (CFLAGS): Subsitute from configure script.  From
+	Jeff Makey <jeff@cts.com>.
+
 Mon Jun 16 13:59:18 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
 
 	* symbols.c (copy_symbol_attributes): Copy BSF_OBJECT flag.
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 6392a06576c..11c66979bba 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -75,7 +75,7 @@ CC = @CC@
 HLDFLAGS = @HLDFLAGS@
 HLDENV = @HLDENV@
 RPATH_ENVVAR = @RPATH_ENVVAR@
-CFLAGS = -g
+CFLAGS = @CFLAGS@
 LDFLAGS =
 DEP = mkdep