diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index ceb9131df..8bb81eb1f 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,11 @@
+2001-08-07  Michael Livshin  <mlivshin@bigfoot.com>
+
+	* guile-snarf-docs-texi.in: don't call the tokenizer here, we now
+	do it from the Makefile.
+
+	* Makefile.am: rearrange the snarfing slightly, so that .doc files
+	are of a reasonable size.
+
 2001-08-01  Marius Vollmer  <mvo@zagadka.ping.de>
 
 	* chars.c (scm_char_alphabetic_p, scm_char_numeric_p,
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index c16bf2f2f..c8c7b8960 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -192,19 +192,19 @@ SUFFIXES = .x .doc
 	|| { rm $@; false; }
 .c.doc:
 	-(test -n "${AWK+set}" || AWK="@AWK@"; ${AWK} -f ./guile-func-name-check $<)
-	./guile-snarf-docs $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ \
-        || { rm $@; false; }
+	(./guile-snarf-docs $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< | \
+	./guile_filter_doc_snarfage --filter-snarfage) > $@ || { rm $@; false; }
 
 $(DOT_X_FILES) $(EXTRA_DOT_DOC_FILES): snarf.h guile-snarf.in
 
-$(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): snarf.h guile-snarf-docs.in
+$(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): snarf.h guile-snarf-docs.in guile_filter_doc_snarfage
 
 error.x: cpp_err_symbols.c
 posix.x: cpp_sig_symbols.c
 load.x: libpath.h
 
-guile.texi: $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) guile-snarf-docs-texi.in guile guile_filter_doc_snarfage
-	./guile-snarf-docs-texi $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) > $@ \
+guile.texi: $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) guile-snarf-docs-texi.in guile
+	cat $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) | ./guile-snarf-docs-texi > $@ \
 	|| { rm $@; false; }
 
 guile-procedures.txt: guile.texi
diff --git a/libguile/guile-snarf-docs-texi.in b/libguile/guile-snarf-docs-texi.in
index 0aa9f9cff..6481534b2 100755
--- a/libguile/guile-snarf-docs-texi.in
+++ b/libguile/guile-snarf-docs-texi.in
@@ -34,4 +34,4 @@ if [ `basename ${bindir}` = libguile ]; then
    GUILE_LOAD_PATH=${srcdir}/..; export GUILE_LOAD_PATH
 fi
 
-cat "$@" | ${bindir}/guile_filter_doc_snarfage --filter-snarfage | ${bindir}/guile -c "${apply_main}"
+${bindir}/guile -c "${apply_main}"