diff --git a/gas/ChangeLog b/gas/ChangeLog
index 93bdb9f292..3d1f353537 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+1999-08-08  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* Makefile.am (noinst_SCRIPTS): Change .gdbinit to $(GDBINIT).
+	(EXTRA_SCRIPTS): Define to keep automake happy.
+
 1999-08-08  Ian Lance Taylor  <ian@zembu.com>
 
 	* Makefile.am: Rename .dep* files to DEP*.
@@ -26,7 +31,7 @@
 1999-08-08  Ian Lance Taylor  <ian@zembu.com>
 
 	* configure.in: Define and substitute GDBINIT.  Change AC_OUTPUT
-	line to crate ${GDBINIT} rather than .gdbinit.
+	line to create ${GDBINIT} rather than .gdbinit.
 	* configure, Makefile.in, doc/Makefile.in: Rebuild.
 
 Fri Aug  6 12:12:44 1999  Jeffrey A Law  (law@cygnus.com)
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 8d4b45d884..b0cc1b26fe 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -369,7 +369,8 @@ po/POTFILES.in: @MAINT@ Makefile
 	  && mv tmp $(srcdir)/po/POTFILES.in
 
 noinst_PROGRAMS = as-new gasp-new
-noinst_SCRIPTS = .gdbinit
+noinst_SCRIPTS = $(GDBINIT)
+EXTRA_SCRIPTS = .gdbinit
 
 $(srcdir)/make-gas.com: stamp-mk.com
 stamp-mk.com: vmsconf.sh Makefile
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 6699255c1d..aba7f9ccbb 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -487,7 +487,8 @@ POTFILES = $(MULTI_CFILES) $(TARGET_ENV_HFILES) $(OBJ_FORMAT_HFILES) \
 
 
 noinst_PROGRAMS = as-new gasp-new
-noinst_SCRIPTS = .gdbinit
+noinst_SCRIPTS = $(GDBINIT)
+EXTRA_SCRIPTS = .gdbinit
 
 EXTRA_DIST = make-gas.com