diff --git a/THANKS b/THANKS
index 3ce973fe..d24f0d93 100644
--- a/THANKS
+++ b/THANKS
@@ -106,6 +106,7 @@ Michel d'Hooge            michel.dhooge@gmail.com
 Michiel De Wilde          mdewilde.agilent@gmail.com
 Mickael Labau             labau_m@epita.fr
 Mike Castle               dalgoda@ix.netcom.com
+Mike Frysinger            vapier@gentoo.org
 Mike Sullivan             Mike.sullivan@Oracle.COM
 Nate Guerin               nathan.guerin@riseup.net
 Neil Booth                NeilB@earthling.net
diff --git a/examples/local.mk b/examples/local.mk
index c2a2ba28..738293d6 100644
--- a/examples/local.mk
+++ b/examples/local.mk
@@ -30,7 +30,8 @@ EXTEXIFLAGS = --synclines
 endif
 extract = VERSION="$(VERSION)" $(PERL) $(extexi) $(EXTEXIFLAGS) $(doc) --
 extracted =
-CLEANFILES += $(extracted) %D%/extracted.stamp
+EXTRA_DIST += $(extracted)
+MAINTAINERCLEANFILES += $(extracted) %D%/extracted.stamp
 %D%/extracted.stamp: $(doc) $(extexi)
 	$(AM_V_GEN)rm -f $@ $@.tmp
 	$(AM_V_at)$(MKDIR_P) %D%
@@ -42,11 +43,33 @@ $(extracted): %D%/extracted.stamp
 	@test -f $@ || rm -f %D%/extracted.stamp
 	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) %D%/extracted.stamp
 
+
+## ------ ##
+## Dist.  ##
+## ------ ##
+
+# Ship the stamp file, otherwise it will be recreated, which is what
+# we want to avoid.
+EXTRA_DIST += %D%/extracted.stamp
+
+# Suppress the #lines from the examples when rolling the tarball, so
+# that regular users have readable examples even before installing
+# Bison.
+dist-hook: examples-unline
+.PHOMY: examples-unline
+examples-unline:
+	for e in $(extracted);			\
+	do					\
+	  e=$(distdir)/$$e;			\
+	  sed -e '/#line/d' $$e >$$e.tmp;	\
+	  mv -f $$e.tmp $$e;			\
+	done
+
+
 ## ---------- ##
 ## Examples.  ##
 ## ---------- ##
 
-
 examplesdir = $(docdir)/examples
 dist_examples_DATA = %D%/README