diff --git a/ChangeLog b/ChangeLog
index f053086a24a53e37e8ea7aed4fe8d02c4f9392e7..75003a8254f5a62ae2a248f8979e32b84accac0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -359,6 +359,9 @@ CVS code -
 	- Clarify descriptions of the characters that aren't allowed
 	  in the "punct" or "brackets" options. (DLR)
 	- Update comment referring to --enable-extra. (DLR)
+- Makefile.am, m4/Makefile.am:
+	- Make sure that the files in EXTRA_DIST are in alphabetical
+	  order, and that the lines are wrapped at 72 characters. (DLR)
 - doc/man/fr/Makefile.am:
 	- Set mandir to @mandir@/fr, so French manpages get installed
 	  where they belong (Jordi).
diff --git a/Makefile.am b/Makefile.am
index 4331fe05acc37f62d71ccae37d817507eb28f352..1fc76111678843c370957441763a2863b054f5c1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,8 +3,8 @@ 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
+EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING ChangeLog INSTALL NEWS \
+		README THANKS TODO UPGRADE config.rpath install-sh \
+		missing mkinstalldirs nano.spec
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/m4/Makefile.am b/m4/Makefile.am
index f7187c250feb4c94904b917bd0d9a2b3e88077cf..23525a9530bc2db55969efa468f6e4a5cba9ec82 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,4 +1,5 @@
-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 glib-2.0.m4
+EXTRA_DIST = codeset.m4 gettext.m4 glib-2.0.m4 glibc21.m4 iconv.m4 \
+		intdiv0.m4 inttypes_h.m4 inttypes.m4 inttypes-pri.m4 \
+		isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 \
+		lib-prefix.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 \
+		ulonglong.m4