diff --git a/configure.in b/configure.in
index ff0fba6f5..a440bb14f 100644
--- a/configure.in
+++ b/configure.in
@@ -657,6 +657,7 @@ EXTRA_DOT_X_FILES="`echo ${LIB@&t@OBJS} | sed 's,\.[[^.]]* ,.x ,g;s,\.[[^.]]*$,.
 AC_SUBST(GUILE_MAJOR_VERSION)
 AC_SUBST(GUILE_MINOR_VERSION)
 AC_SUBST(GUILE_MICRO_VERSION)
+AC_SUBST(GUILE_EFFECTIVE_VERSION)
 AC_SUBST(GUILE_VERSION)
 
 #######################################################################
@@ -698,18 +699,13 @@ AC_SUBST(EXTRA_DOT_X_FILES)
 dnl See also top_builddir in info node: (libtool)AC_PROG_LIBTOOL
 top_builddir_absolute=`pwd`
 AC_SUBST(top_builddir_absolute)
-top_srcdir_absolute=`(cd $srcdir ; pwd)`
+top_srcdir_absolute=`(cd $srcdir && pwd)`
 AC_SUBST(top_srcdir_absolute)
 
 AC_CONFIG_FILES([
   Makefile
   am/Makefile
   libguile/Makefile
-  libguile/guile-snarf
-  libguile/guile-doc-snarf
-  libguile/guile-func-name-check
-  libguile/guile-snarf-docs
-  libguile/version.h
   libguile-ltdl/Makefile
   libguile-ltdl/upstream/Makefile
   ice-9/Makefile
@@ -735,19 +731,19 @@ AC_CONFIG_FILES([
   examples/box-dynamic-module/Makefile
   examples/modules/Makefile
   examples/safe/Makefile
-  test-suite/Makefile
-  check-guile
-  guile-tools
-  pre-inst-guile])
+  test-suite/Makefile])
 
-AC_CONFIG_COMMANDS(default,
-  [ chmod +x libguile/guile-snarf \
-             libguile/guile-doc-snarf \
-             libguile/guile-func-name-check \
-             libguile/guile-snarf-docs \
-             check-guile \
-             guile-tools \
-             pre-inst-guile])
+AC_CONFIG_FILES([check-guile], [chmod +x check-guile])
+AC_CONFIG_FILES([guile-tools], [chmod +x guile-tools])
+AC_CONFIG_FILES([pre-inst-guile], [chmod +x pre-inst-guile])
+AC_CONFIG_FILES([libguile/guile-snarf],
+                [chmod +x libguile/guile-snarf])
+AC_CONFIG_FILES([libguile/guile-doc-snarf],
+                [chmod +x libguile/guile-doc-snarf])
+AC_CONFIG_FILES([libguile/guile-func-name-check],
+                [chmod +x libguile/guile-func-name-check])
+AC_CONFIG_FILES([libguile/guile-snarf-docs],
+                [chmod +x libguile/guile-snarf-docs])
 
 AC_OUTPUT