diff --git a/ChangeLog b/ChangeLog
index 20f3b08f..bf43c6b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -392,6 +392,11 @@ CVS code -
 - nano.texi:
 	- Eliminate references to the now removed -D/--dos and -M/--mac
 	  command line options, and their corresponding toggles. (DLR)
+- m4/Makefile.am:
+	- Add glib-2.0.m4 to EXTRA_DIST, so that nano builds from CVS
+	  with automake 1.7.x again.  For some reason, automake 1.9.x
+	  didn't have a problem with its (erroneously) being left out.
+	  (DLR, problem found by Chris)
 - m4/glib-2.0.m4:
 	- New file imported from glib 2.4.7.  This is needed to detect
 	  glib 2.x on systems that may not have it installed. (DLR,
diff --git a/Makefile.am b/Makefile.am
index 1b771f27..4331fe05 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,6 @@ AUTOMAKE_OPTIONS = gnu no-dependencies
 
 SUBDIRS = doc m4 po src
 
-
 EXTRA_DIST =	ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
 		README THANKS TODO UPGRADE config.rpath install-sh missing \
 		mkinstalldirs nano.spec
diff --git a/doc/texinfo/Makefile.am b/doc/texinfo/Makefile.am
index d2251ae3..32677208 100644
--- a/doc/texinfo/Makefile.am
+++ b/doc/texinfo/Makefile.am
@@ -1,4 +1,5 @@
 info_TEXINFOS = nano.texi
+
 MAKEINFO = makeinfo --no-split
 
 EXTRA_DIST = nano.info
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 79ce4f04..f7187c25 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,4 +1,4 @@
 EXTRA_DIST = ulonglong.m4 intdiv0.m4 inttypes.m4 inttypes_h.m4 inttypes-pri.m4 \
 	     stdint_h.m4 uintmax_t.m4 isc-posix.m4 lib-ld.m4 lib-link.m4 \
 	     lib-prefix.m4 codeset.m4 glibc21.m4 progtest.m4 gettext.m4 \
-	     iconv.m4 lcmessage.m4
+	     iconv.m4 lcmessage.m4 glib-2.0.m4