diff --git a/docs/fwg/Makefile.am b/docs/fwg/Makefile.am
index b7dba25e8b..5580b45837 100644
--- a/docs/fwg/Makefile.am
+++ b/docs/fwg/Makefile.am
@@ -13,11 +13,6 @@ PDFS=$(FIGS:.fig=.pdf)
 SRC=$(XML)
 CSS=base.css
 
-EXTRA_DIST = $(XML) $(FIGS)
-
-## FIXME if we don't do this they don't get cleaned up in make distcheck
-## but maybe this is not the best way to do it
-CONFIG_CLEAN_FILES = $(XML) $(FIGS)
+EXTRA_DIST = $(XML) $(FIGS) $(CSS) magic-png magic-pdf
 
 include $(srcdir)/../manuals.mak
-
diff --git a/docs/manual/Makefile.am b/docs/manual/Makefile.am
index aef9be012a..ff8b0e3227 100644
--- a/docs/manual/Makefile.am
+++ b/docs/manual/Makefile.am
@@ -13,10 +13,6 @@ PDFS=$(FIGS:.fig=.pdf)
 SRC=$(XML)
 CSS=base.css
 
-EXTRA_DIST = $(XML) $(FIGS)
-
-## FIXME if we don't do this they don't get cleaned up in make distcheck
-## but maybe this is not the best way to do it
-CONFIG_CLEAN_FILES = $(XML) $(FIGS)
+EXTRA_DIST = $(XML) $(FIGS) $(CSS) magic-png magic-pdf
 
 include $(srcdir)/../manuals.mak