diff --git a/Makefile.am b/Makefile.am
index 1afdb9133..fb5a1b465 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in.
 
-SUBDIRS = ice-9 qt libguile build
+SUBDIRS = ice-9 qt libguile guile-config
 
 ## FIXME: in the future there will be direct automake support for
 ## doing this.  When that happens, switch over.
diff --git a/Makefile.in b/Makefile.in
index 4360469e2..a50acbb1a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,7 +87,7 @@ qtmd_h = @qtmd_h@
 qtmdc_c = @qtmdc_c@
 qtmds_s = @qtmds_s@
 
-SUBDIRS = ice-9 qt libguile build
+SUBDIRS = ice-9 qt libguile guile-config
 
 aclocaldir = $(datadir)/aclocal
 aclocal_DATA = guile.m4 qthreads.m4
diff --git a/aclocal.m4 b/aclocal.m4
index f8d5e0e20..e96cd4e63 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -571,7 +571,7 @@ dnl	    pass the relative path to the ../libfoo.la file, but
 dnl	 2) once the whole package has been installed, users should
 dnl	    link using -lfoo. 
 dnl   Normally, we only care about the first case, but since the
-dnl   build-guile script needs to give users all the flags they need
+dnl   guile-config script needs to give users all the flags they need
 dnl   to link programs against guile, the GUILE_WITH_THREADS macro
 dnl   needs to supply the second piece of information as well.
 dnl
diff --git a/configure b/configure
index b20761989..0a365941a 100755
--- a/configure
+++ b/configure
@@ -4632,7 +4632,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile build/Makefile libguile/scmconfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile libguile/scmconfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4745,7 +4745,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile build/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -4914,7 +4914,6 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
-
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > libguile/stamp-h
diff --git a/configure.in b/configure.in
index ac6970c1f..f47626bd1 100644
--- a/configure.in
+++ b/configure.in
@@ -399,7 +399,7 @@ AC_SUBST(GUILE_MAJOR_VERSION)
 AC_SUBST(GUILE_MINOR_VERSION)
 AC_SUBST(GUILE_VERSION)
 
-dnl Tell build-guile what flags guile users should link against.
+dnl Tell guile-config what flags guile users should link against.
 GUILE_LIBS="$LDFLAGS $THREAD_LIBS_INSTALLED $LIBS"
 AC_SUBST(GUILE_LIBS)
 
@@ -417,7 +417,7 @@ AC_SUBST(GUILE_STAMP)
 AC_SUBST(AWK)
 AC_SUBST(LIBLOBJS)
 
-AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile build/Makefile], [chmod +x libguile/guile-snarf])
+AC_OUTPUT([Makefile libguile/Makefile libguile/guile-snarf ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile], [chmod +x libguile/guile-snarf])
 
 dnl Local Variables:
 dnl comment-start: "dnl "
diff --git a/qthreads.m4 b/qthreads.m4
index adaf1aad8..ca8b4a806 100644
--- a/qthreads.m4
+++ b/qthreads.m4
@@ -30,7 +30,7 @@ dnl	    pass the relative path to the ../libfoo.la file, but
 dnl	 2) once the whole package has been installed, users should
 dnl	    link using -lfoo. 
 dnl   Normally, we only care about the first case, but since the
-dnl   build-guile script needs to give users all the flags they need
+dnl   guile-config script needs to give users all the flags they need
 dnl   to link programs against guile, the GUILE_WITH_THREADS macro
 dnl   needs to supply the second piece of information as well.
 dnl