diff --git a/Makefile.in b/Makefile.in
index e07c5057d..e2e8fa0be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -104,9 +104,10 @@ CONFIG_CLEAN_FILES =
 DATA =  $(aclocal_DATA)
 
 DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS THANKS TODO acinclude.m4 aclocal.m4 config.guess \
-config.sub configure configure.in install-sh ltconfig ltmain.sh \
-mdate-sh missing mkinstalldirs
+Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 aclocal.m4 \
+config.guess config.sub configure configure.in install-sh \
+libguile/scmconfig.h.in libguile/stamp-h.in ltconfig ltmain.sh mdate-sh \
+missing mkinstalldirs
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -130,6 +131,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
+libguile/scmconfig.h: libguile/stamp-h
+	@if test ! -f $@; then \
+		rm -f libguile/stamp-h; \
+		$(MAKE) libguile/stamp-h; \
+	else :; fi
+libguile/stamp-h: $(srcdir)/libguile/scmconfig.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=libguile/scmconfig.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > libguile/stamp-h 2> /dev/null
+$(srcdir)/libguile/scmconfig.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/libguile/stamp-h.in
+	@if test ! -f $@; then \
+		rm -f $(srcdir)/libguile/stamp-h.in; \
+		$(MAKE) $(srcdir)/libguile/stamp-h.in; \
+	else :; fi
+$(srcdir)/libguile/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/libguile/stamp-h.in 2> /dev/null
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+	-rm -f libguile/scmconfig.h
+
+maintainer-clean-hdr:
+
 install-aclocalDATA: $(aclocal_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(aclocaldir)
@@ -338,29 +367,30 @@ distclean-generic:
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-tags clean-generic mostlyclean-am
+clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
 
 clean: clean-recursive
 
-distclean-am:  distclean-tags distclean-generic clean-am
+distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
 	-rm -f libtool
 
 distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
+maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+		maintainer-clean-generic distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
-.PHONY: uninstall-aclocalDATA install-aclocalDATA install-data-recursive \
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+uninstall-aclocalDATA install-aclocalDATA install-data-recursive \
 uninstall-data-recursive install-exec-recursive \
 uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
 all-recursive check-recursive installcheck-recursive info-recursive \
diff --git a/configure b/configure
index f99c40fb1..082c5d506 100755
--- a/configure
+++ b/configure
@@ -4868,7 +4868,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile libguile/Makefile libguile/guile-snarf libguile/versiondat.h ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile doc/Makefile libguile/scmconfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile libguile/Makefile libguile/guile-snarf libguile/versiondat.h ice-9/Makefile qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile doc/Makefile libguile/scmconfig.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -4991,7 +4991,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile libguile/Makefile libguile/guile-snarf libguile/versiondat.h ice-9/Makefile ice-9/version.scm qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile doc/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile libguile/Makefile libguile/guile-snarf libguile/versiondat.h ice-9/Makefile qt/Makefile qt/qt.h qt/md/Makefile qt/time/Makefile guile-config/Makefile doc/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/ice-9/Makefile.in b/ice-9/Makefile.in
index b48c01478..4a8d07b4b 100644
--- a/ice-9/Makefile.in
+++ b/ice-9/Makefile.in
@@ -103,10 +103,10 @@ ETAGS_ARGS = $(subpkgdata_DATA)
 EXTRA_DIST = $(ice9_sources) test.scm
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../libguile/scmconfig.h
-CONFIG_CLEAN_FILES =  version.scm
+CONFIG_CLEAN_FILES = 
 DATA =  $(subpkgdata_DATA)
 
-DIST_COMMON =  COPYING ChangeLog Makefile.am Makefile.in version.scm.in
+DIST_COMMON =  COPYING ChangeLog Makefile.am Makefile.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -122,8 +122,6 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-version.scm: $(top_builddir)/config.status version.scm.in
-	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 install-subpkgdataDATA: $(subpkgdata_DATA)
 	@$(NORMAL_INSTALL)