diff --git a/configure.ac b/configure.ac
index 9ab6dcbf85..c4a6ca6875 100644
--- a/configure.ac
+++ b/configure.ac
@@ -65,7 +65,6 @@ AC_SUBST([GENERIC_RELEASE])
 AC_SUBST([GENERIC_VERSION])
 
 AC_CONFIG_HEADERS([config_auto.h:config/config.h.in])
-AM_MAINTAINER_MODE
 
 # default conditional
 AM_CONDITIONAL([T_WIN], false)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d2e7b9333f..e016eff2d8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-if MAINTAINER_MODE
+# doc/Makefile.am
 
 asciidoc=asciidoc -d manpage
 
@@ -28,5 +28,3 @@ man_MANS = \
 	$(asciidoc) -o $@ $<
 
 MAINTAINERCLEANFILES = $(man_MANS) Doxyfile
-
-endif # MAINTAINER_MODE