diff --git a/ChangeLog b/ChangeLog
index 62672f24..0e60fd15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-20  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* man/Makefile.am, man/generate_mans.mak: Update clean targets,
+	due to the generation in separate sub folders.
+
 2012-05-20  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* man/su.1.xml: Document author to avoid warnings during
diff --git a/man/Makefile.am b/man/Makefile.am
index 7e013a01..b39043e3 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -187,7 +187,7 @@ if ENABLE_REGENERATE_MAN
 
 include generate_mans.mak
 
-CLEANFILES = $(man_MANS)
+CLEANFILES = $(man_MANS) man1/id.1 man8/sulogin.8
 
 else
 $(man_MANS):
diff --git a/man/generate_mans.mak b/man/generate_mans.mak
index a4418046..0c959c26 100644
--- a/man/generate_mans.mak
+++ b/man/generate_mans.mak
@@ -30,9 +30,14 @@ if ENABLE_REGENERATE_MAN
 
 man1/% man3/% man5/% man8/%: %.xml-config Makefile config.xml
 	$(XSLTPROC) --stringparam profile.condition "$(PAM_COND);$(SHADOWGRP_COND);$(TCB_COND);$(SHA_CRYPT_COND)" \
+	            --param "man.authors.section.enabled" "0" \
 	            --stringparam "man.output.base.dir" "" \
 	            --param "man.output.in.separate.dir" "1" \
 	            -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/profile-docbook.xsl $<
+
+clean-local:
+	for d in man1 man3 man5 man8; do [ -d $$d ] && rmdir $$d; done
+
 else
 $(man_MANS):
 	@echo you need to run configure with --enable-man to generate man pages