diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 9051d46c9..5ae5e6c9e 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -3,23 +3,23 @@
 ##  	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
-##   
+##
 ##   GUILE is free software; you can redistribute it and/or modify
 ##   it under the terms of the GNU General Public License as
 ##   published by the Free Software Foundation; either version 2, or
 ##   (at your option) any later version.
-##   
+##
 ##   GUILE is distributed in the hope that it will be useful, but
 ##   WITHOUT ANY WARRANTY; without even the implied warranty of
 ##   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ##   GNU General Public License for more details.
-##   
+##
 ##   You should have received a copy of the GNU General Public
 ##   License along with GUILE; see the file COPYING.  If not, write
 ##   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@
@@ -93,11 +93,6 @@ EXTRA_libguile_la_SOURCES = _scm.h		\
     filesys.c posix.c net_db.c socket.c \
     ramap.c unif.c debug-malloc.c
 
-## In next release, threads will be factored out of libguile.
-## Until then, the machine specific headers is a temporary kludge.
-OMIT_DEPENDENCIES = libguile.h ltdl.h \
-    axp.h hppa.h i386.h ksr.h m88k.h mips.h sparc.h vax.h
-
 ## This is kind of nasty... there are ".c" files that we don't want to
 ## compile, since they are #included in threads.c.  So instead we list
 ## them here.  Perhaps we can deal with them normally once the merge
@@ -108,7 +103,7 @@ libguile_la_DEPENDENCIES = @LIBLOBJS@
 libguile_la_LIBADD = @LIBLOBJS@ $(LIBLTDL)
 libguile_la_LDFLAGS = -version-info @LIBGUILE_MAJOR_VERSION@:@LIBGUILE_MINOR_VERSION@:@LIBGUILE_REVISION_VERSION@ -export-dynamic
 
-# These are headers visible as <guile/mumble.h> 
+# These are headers visible as <guile/mumble.h>
 pkginclude_HEADERS = gh.h
 
 # These are headers visible as <libguile/mumble.h>.
@@ -139,7 +134,7 @@ EXTRA_DIST = ChangeLog-gh ChangeLog-scm ChangeLog-threads cpp_signal.c	\
 
 ## FIXME: Consider using timestamp file, to avoid unnecessary rebuilds.
 libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	@echo "Generating libpath.h..." 
+	@echo "Generating libpath.h..."
 	@rm -f libpath.tmp
 	@echo '/* generated by Makefile */' > libpath.tmp
 	@echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> libpath.tmp
@@ -173,7 +168,7 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	@mv libpath.tmp libpath.h
 
 
-#	./guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ 
+#	./guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
 
 SUFFIXES = .x .doc
 .c.x: