diff --git a/Makefile.am b/Makefile.am
index 7419305..3e4415c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,6 +4,12 @@ dist_bin_SCRIPTS = bin/stow bin/chkstow
 info_TEXINFOS = doc/stow.texi
 dist_man_MANS = doc/stow.8
 dist_doc_DATA = README doc/manual.html doc/manual.pdf
+
+# Would be nice to include the split page HTML version of the manual
+# in the distribution, but automake doesn't support wildcards and I'm
+# loathe to explicitly list every single page here :-(
+#nobase_dist_doc_DATA = doc/stow.html/*.html
+
 pmdir = $(libdir)/perl5
 dist_pm_DATA = lib/Stow.pm
 pmstowdir = $(pmdir)/Stow
@@ -35,8 +41,6 @@ TESTS_ENVIRONMENT = $(PERL) -I$(srcdir)/bin -I$(srcdir)/lib -I$(TESTS_DIR)
 # exists (otherwise automake will try to build it).
 TESTS = t
 
-AUTOMAKE_OPTIONS = dist-shar
-
 # GNU autotools standardised on the 'check' target, but CPAN (and the
 # rest of the world) standardised on the 'test' target.
 test: check
@@ -76,7 +80,7 @@ EXTRA_DIST = \
 	$(CPAN_FILES)
 CLEANFILES = $(bin_SCRIPTS) $(dist_pm_DATA)
 
-# clean up files left behind by test suite
+# clean up auto-generated files
 clean-local:
 	-rm -rf $(TESTS_OUT) \
 		bin/stow bin/chkstow doc/stow.8 ChangeLog \
diff --git a/configure.ac b/configure.ac
index 65b5f32..1f1c468 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR([automake])
 # Unfortunately we have to disable warnings for overrides, because we
 # need to override the built-in `check' rule and also the TEXI2DVI
 # variable.
-AM_INIT_AUTOMAKE([-Wall -Werror -Wno-override])
+AM_INIT_AUTOMAKE([-Wall -Werror -Wno-override dist-bzip2])
 AC_PROG_INSTALL
 
 AM_MAINTAINER_MODE([enable])