diff --git a/configure.in b/configure.in
index da37bc9c..4bad3e20 100644
--- a/configure.in
+++ b/configure.in
@@ -391,16 +391,16 @@ esac
 # Specify what files are to be created.
 AC_CONFIG_FILES(Makefile glob/Makefile po/Makefile.in config/Makefile doc/Makefile)
 
-# We only generate the build.sh if we have a build.sh.in; we won't have
-# one before we've created a distribution.
-m4_syscmd([test -f build.sh.in])dnl
-m4_if(m4_sysval, 0, [AC_CONFIG_FILES(build.sh)])
-
-
 # OK, do it!
 
 AC_OUTPUT
 
+# We only generate the build.sh if we have a build.sh.in; we won't have
+# one before we've created a distribution.
+if test -f build.sh.in; then
+  ./config.status --file build.sh
+  chmod +x build.sh
+fi
 
 dnl Local Variables:
 dnl comment-start: "dnl "
diff --git a/doc/make.texi b/doc/make.texi
index e814ec2f..8c367bae 100644
--- a/doc/make.texi
+++ b/doc/make.texi
@@ -338,8 +338,6 @@ Makefile Conventions
 * Standard Targets::            Standard Targets for Users
 * Install Command Categories::  Three categories of commands in the `install'
 
-Copying This Manual
-
 @end detailmenu
 @end menu