diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 6ab44667e..5be7c4100 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-27  Michael Livshin  <mlivshin@bigfoot.com>
+
+	* Makefile.am (c-tokenize.c): add rule to generate it.
+	(EXTRA_DIST): add c-tokenize.lex, so it gets distributed.
+
+	filter-doc-snarfage.c: remove.
+
 2001-06-26  Martin Grabmueller  <mgrabmue@cs.tu-berlin.de>
 
 	* ports.c (scm_output_port_p): Use result of SCM_COERCE_OUTPORT.
diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index b701dabd0..c16bf2f2f 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -145,7 +145,8 @@ bin_SCRIPTS = guile-snarf guile-doc-snarf guile-snarf-docs \
     guile-snarf-docs-texi guile-func-name-check
 
 EXTRA_DIST = ChangeLog-gh ChangeLog-scm ChangeLog-threads cpp_signal.c	\
-    cpp_errno.c cpp_err_symbols.in cpp_sig_symbols.in cpp_cnvt.awk
+    cpp_errno.c cpp_err_symbols.in cpp_sig_symbols.in cpp_cnvt.awk \
+    c-tokenize.lex
 #    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
 #    guile-procedures.txt guile.texi
 
@@ -210,6 +211,9 @@ guile-procedures.txt: guile.texi
 	rm -f $@
 	makeinfo --force -o $@ $< || test -f $@
 
+c-tokenize.c: c-tokenize.lex
+	flex -t $< > $@ || { rm $@; false; }
+
 schemelibdir = $(pkgdatadir)/$(VERSION)
 schemelib_DATA = guile-procedures.txt
 
diff --git a/libguile/filter-doc-snarfage.c b/libguile/filter-doc-snarfage.c
deleted file mode 100644
index e69de29bb..000000000