diff --git a/Makefile.am b/Makefile.am
index 01ef4bb..40e3178 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ messages:
 
 docs:
 	$(mkinstalldirs) $(DESTDIR)$(helpdir)
-	perl admin/gendoc.pl -v $(VERSION) $(DESTDIR)$(helpdir) \
+	perl data/gendoc/gendoc.pl -v $(VERSION) $(DESTDIR)$(helpdir) \
           data/doctemplates/*.template \
           `find ./ -name "*.cpp" -print` \
 		  `find ./ -name "*.h" -print`
diff --git a/admin/Makefile.am b/admin/Makefile.am
index cbce7d7..e7a6bc9 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = acinclude.m4.in libtool.m4.in gendoc.pl gensrc.pl
+EXTRA_DIST = acinclude.m4.in libtool.m4.in
diff --git a/configure.in b/configure.in
index 2b0c52d..b371140 100644
--- a/configure.in
+++ b/configure.in
@@ -126,6 +126,7 @@ AC_OUTPUT( \
 	data/deftheme/Makefile \
 	data/deftheme/silverirc/Makefile \
 	data/doctemplates/Makefile \
+	data/gendoc/Makefile \
 	data/mimelnk/Makefile \
 	data/msgcolors/Makefile \
 	data/protocols/Makefile \
diff --git a/data/Makefile.am b/data/Makefile.am
index f06b741..000cda1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,4 +3,4 @@
 ###############################################################################
 
 SUBDIRS = app config defscript deftheme doctemplates \
-          mimelnk msgcolors protocols
+          gendoc mimelnk msgcolors protocols
diff --git a/data/gendoc/Makefile.am b/data/gendoc/Makefile.am
new file mode 100644
index 0000000..bf09206
--- /dev/null
+++ b/data/gendoc/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = gendoc.pl
diff --git a/admin/gendoc.pl b/data/gendoc/gendoc.pl
similarity index 100%
rename from admin/gendoc.pl
rename to data/gendoc/gendoc.pl