diff --git a/Makefile.am b/Makefile.am
index 0bc3d948..4a627b1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 # Process this file with automake to create Makefile.in
 
-SUBDIRS = . aclocal doc etc macos man src win32
+SUBDIRS = . aclocal etc macos man src win32
+DIST_SUBDIRS = . aclocal doc etc macos man src win32
 
 EXTRA_DIST = ANNOUNCE CodingStyle QUICKSTART README \
 	bootstrap Makefile.mak depcomp \
@@ -16,9 +17,3 @@ MAINTAINERCLEANFILES = \
 DEPCLEANFILES = config.log configure
 
 AUTOMAKE_OPTIONS = foreign 1.5
-
-dist: gendoc
-
-gendoc:
-	sh $(srcdir)/doc/export-wiki.sh $(srcdir)/doc
-	sh $(srcdir)/doc/old/generate.sh $(srcdir)/doc/old
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0ccdaf01..34b96a97 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -4,6 +4,10 @@ SUBDIRS = . old src
 
 MAINTAINERCLEANFILES = Makefile.in $(HTML)
 
-EXTRA_DIST = README export-wiki.sh export-wiki.xsl $(HTML)
+EXTRA_DIST = README export-wiki.sh export-wiki.xsl $(HTML) index.html
 
 HTML= $(shell ls $(srcdir)/*.html $(srcdir)/*.css)
+
+index.html:
+	sh $(srcdir)/export-wiki.sh $(srcdir)
+	sh $(srcdir)/old/generate.sh $(srcdir)/old