diff --git a/Makefile.am b/Makefile.am
index aa27b9a4d..a6ac392aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 ## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = @existingdirs@ doc newdoc
+SUBDIRS = @existingdirs@ newdoc
 
-guile_dirs = @existingdirs@ doc newdoc
+guile_dirs = @existingdirs@ newdoc
 guile-dist:
 	$(MAKE) SUBDIRS="$(guile_dirs)" dist
 
diff --git a/Makefile.in b/Makefile.in
index de3de9db2..a5fd702c7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,15 +37,15 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 transform = @program_transform_name@
-VERSION = @VERSION@
+MAINT = @MAINT@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 PACKAGE = @PACKAGE@
-MAINT = @MAINT@
 existingdirs = @existingdirs@
+VERSION = @VERSION@
 
-SUBDIRS = @existingdirs@ doc newdoc
+SUBDIRS = @existingdirs@ newdoc
 
-guile_dirs = @existingdirs@ doc newdoc
+guile_dirs = @existingdirs@ newdoc
 
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = guile.m4 threads.m4
diff --git a/configure b/configure
index ae0e40870..89d7e533f 100755
--- a/configure
+++ b/configure
@@ -831,7 +831,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile doc/Makefile doc/guile-programmer/Makefile doc/guile-user/Makefile newdoc/Makefile newdoc/ref/Makefile newdoc/tutorial/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile newdoc/Makefile newdoc/ref/Makefile newdoc/tutorial/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -911,7 +911,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile doc/guile-programmer/Makefile doc/guile-user/Makefile newdoc/Makefile newdoc/ref/Makefile newdoc/tutorial/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile newdoc/Makefile newdoc/ref/Makefile newdoc/tutorial/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/configure.in b/configure.in
index 715a6b66c..0dfd707a6 100644
--- a/configure.in
+++ b/configure.in
@@ -25,4 +25,4 @@ for d in $req_subdirs; do
 done
 
 AC_SUBST(existingdirs)
-AC_OUTPUT(Makefile doc/Makefile doc/guile-programmer/Makefile doc/guile-user/Makefile newdoc/Makefile newdoc/ref/Makefile newdoc/tutorial/Makefile)
+AC_OUTPUT(Makefile newdoc/Makefile newdoc/ref/Makefile newdoc/tutorial/Makefile)