diff --git a/doc/Makefile.am b/doc/Makefile.am
index 718d23fe..0ccdaf01 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = . old src
 
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in $(HTML)
 
 EXTRA_DIST = README export-wiki.sh export-wiki.xsl $(HTML)
 
diff --git a/doc/old/Makefile.am b/doc/old/Makefile.am
index 02255a05..fb00e96c 100644
--- a/doc/old/Makefile.am
+++ b/doc/old/Makefile.am
@@ -1,11 +1,10 @@
 # Process this file with automake to create Makefile.in
 
 XSLTPROC = @XSLTPROC@
-HTMLFILES = opensc.html opensc.css opensc-es.html
-XMLFILES = opensc.xml opensc.xsl opensc-es.xml
-STYLESHEET = opensc.xsl
+SOURCE = opensc.xml opensc.xsl opensc-es.xml opensc.css opensc.xsl
+GENERATE = opensc.html opensc-es.html
 
-MAINTAINERCLEANFILES = Makefile.in 
+MAINTAINERCLEANFILES = Makefile.in $(GENERATE)
 
-EXTRA_DIST = pkcs-15v1_1.asn $(XMLFILES) $(HTMLFILES) $(STYLESHEET) doxygen.conf generate.sh
+EXTRA_DIST = pkcs-15v1_1.asn $(SOURCE) $(GENERATE) doxygen.conf generate.sh