diff --git a/ice-9/Makefile.am b/ice-9/Makefile.am
index e9af0558a..09f7bdae3 100644
--- a/ice-9/Makefile.am
+++ b/ice-9/Makefile.am
@@ -19,7 +19,7 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = gnu
 
 # These should be installed and distributed.
 ice9_sources =								   \
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 8eaa24fc5..64eae886e 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -19,7 +19,7 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = gnu
 
 ## Prevent automake from adding extra -I options
 DEFS = @DEFS@
diff --git a/oop/Makefile.am b/oop/Makefile.am
index 0587c83be..adf3fbb66 100644
--- a/oop/Makefile.am
+++ b/oop/Makefile.am
@@ -19,7 +19,7 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = gnu
 
 SUBDIRS = goops
 
diff --git a/oop/goops/Makefile.am b/oop/goops/Makefile.am
index b80216bbc..e447598f9 100644
--- a/oop/goops/Makefile.am
+++ b/oop/goops/Makefile.am
@@ -19,7 +19,7 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = gnu
 
 # These should be installed and distributed.
 goops_sources =							\
diff --git a/qt/Makefile.am b/qt/Makefile.am
index ab0aa3cb6..926f15575 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -19,7 +19,7 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = gnu
 
 ## subdirs are for making distributions only.
 SUBDIRS = md time
diff --git a/qt/md/Makefile.am b/qt/md/Makefile.am
index d576ffb8b..66e2ea8bd 100644
--- a/qt/md/Makefile.am
+++ b/qt/md/Makefile.am
@@ -19,7 +19,7 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = gnu
 
 EXTRA_DIST = _sparc.s _sparc_b.s axp.1.Makefile axp.2.Makefile \
 axp.Makefile axp.README axp.c axp.h axp.s axp_b.s default.Makefile \
diff --git a/qt/time/Makefile.am b/qt/time/Makefile.am
index a982bdf18..ab4fffee1 100644
--- a/qt/time/Makefile.am
+++ b/qt/time/Makefile.am
@@ -19,6 +19,6 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = gnu
 
 EXTRA_DIST = README.time assim cswap go init prim raw
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 373f03d69..effdfe8df 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -19,7 +19,7 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = gnu
 
 # These should be installed and distributed.
 scripts_sources =		\
diff --git a/srfi/Makefile.am b/srfi/Makefile.am
index 8340ab1b2..01e16aa99 100644
--- a/srfi/Makefile.am
+++ b/srfi/Makefile.am
@@ -19,7 +19,7 @@
 ##   to the Free Software Foundation, Inc., 59 Temple Place, Suite
 ##   330, Boston, MA 02111-1307 USA
 
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = gnu
 
 ## Prevent automake from adding extra -I options
 DEFS = @DEFS@