diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
index 904124fa3..a5873434d 100644
--- a/doc/ref/Makefile.am
+++ b/doc/ref/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##  	Copyright (C) 1998, 2004, 2006, 2008, 2009 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 2004, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -130,15 +130,28 @@ EXTRA_DIST += lib-version.texi
 CLEANFILES = lib-version.texi
 
 # Support for snarfing docs out of Scheme modules.
-snarf_doc=standard-library
-$(snarf_doc)scmfiles:
-	$(preinstguile) -l $(srcdir)/$(snarf_doc).scm \
-	 -c '(for-each (lambda (m) (format #t "~a.scm\n" (string-join (map symbol->string m) "/"))) (map car *modules*))' \
-	 > $@
-depfiles=$(addprefix $(top_srcdir)/module/,$(shell test ! -f $(snarf_doc)scmfiles || cat $(snarf_doc)scmfiles))
+snarf_doc = standard-library
 
-$(snarf_doc).texi: $(srcdir)/$(snarf_doc).scm $(snarf_doc)scmfiles $(depfiles)
-	$(top_builddir)/meta/uninstalled-env $(srcdir)/make-texinfo.scm $(srcdir)/$(snarf_doc).scm >$@
+$(snarf_doc).am: $(snarf_doc).scm
+	GUILE_AUTO_COMPILE=0 ;							\
+	variable="`echo $(snarf_doc) | tr - _`_scm_files" ;			\
+	"$(preinstguile)" -l "$(srcdir)/$(snarf_doc).scm" -c "			\
+	 (format #t \"# Automatically generated, do not edit.~%\")		\
+	 (format #t \"$$variable = \")						\
+	 (for-each (lambda (m)							\
+	             (format #t \"$$""(top_srcdir)/module/~a.scm \"		\
+	                     (string-join (map symbol->string m) \"/\")))	\
+	           (map car *modules*))" > "$@.tmp"
+	mv "$@.tmp" "$@"
 
-CLEANFILES+=$(snarf_doc).texi $(snarf_doc)scmfiles
-EXTRA_DIST+=$(snarf_doc).scm make-texinfo.scm $(snarf_doc).texi $(snarf_doc)scmfiles
+# The following line leads to the definition of $(standard_library_scm_files).
+include standard-library.am
+
+$(snarf_doc).texi: $(standard_library_scm_files)
+	GUILE_AUTO_COMPILE=0				\
+	"$(preinstguile)" "$(srcdir)/make-texinfo.scm"	\
+	  "$(srcdir)/$(snarf_doc).scm" > "$@.tmp"
+	mv "$@.tmp" "$@"
+
+CLEANFILES += $(snarf_doc).texi
+EXTRA_DIST += $(snarf_doc).scm make-texinfo.scm $(snarf_doc).texi $(snarf_doc).am
diff --git a/doc/ref/make-texinfo.scm b/doc/ref/make-texinfo.scm
old mode 100755
new mode 100644
index ec59742a6..c967bc163
--- a/doc/ref/make-texinfo.scm
+++ b/doc/ref/make-texinfo.scm
@@ -1,6 +1,3 @@
-#!/usr/bin/env guile
-!#
-
 ;; make-texinfo.scm -- document a set of scheme modules as texinfo
 ;; Copyright (C) 2006,2007,2009  Andy Wingo <wingo at pobox dot com>
 
diff --git a/doc/ref/standard-library.am b/doc/ref/standard-library.am
new file mode 100644
index 000000000..27246f4ff
--- /dev/null
+++ b/doc/ref/standard-library.am
@@ -0,0 +1,2 @@
+# Automatically generated, do not edit.
+standard_library_scm_files = $(top_srcdir)/module/statprof.scm $(top_srcdir)/module/sxml/apply-templates.scm $(top_srcdir)/module/sxml/fold.scm $(top_srcdir)/module/sxml/simple.scm $(top_srcdir)/module/sxml/ssax.scm $(top_srcdir)/module/sxml/ssax/input-parse.scm $(top_srcdir)/module/sxml/transform.scm $(top_srcdir)/module/sxml/xpath.scm $(top_srcdir)/module/texinfo.scm $(top_srcdir)/module/texinfo/docbook.scm $(top_srcdir)/module/texinfo/html.scm $(top_srcdir)/module/texinfo/indexing.scm $(top_srcdir)/module/texinfo/string-utils.scm $(top_srcdir)/module/texinfo/plain-text.scm $(top_srcdir)/module/texinfo/serialize.scm $(top_srcdir)/module/texinfo/reflection.scm 
\ No newline at end of file