diff --git a/ChangeLog b/ChangeLog
index 4a2ca633c..2c1507236 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-05  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+
+	* hw/xfree86/fbdevhw/Makefile.am:
+	Clean up generated files to pass distcheck
+
+	* hw/xfree86/getconfig/Makefile.am:
+	Clean up generated files to pass distcheck
+	Distribute getconfig.man.pre, not getconfig.man
+
 2005-10-05  Kristian Høgsberg  <krh@redhat.com>
 
 	* afb/Makefile.am:
diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am
index 03f3cad0a..11df42352 100644
--- a/hw/xfree86/fbdevhw/Makefile.am
+++ b/hw/xfree86/fbdevhw/Makefile.am
@@ -18,7 +18,7 @@ include $(top_srcdir)/cpprules.in
 
 drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
 driverman_DATA = fbdevhw.$(DRIVER_MAN_SUFFIX)
-CLEANFILES = $(driverman_DATA)
+CLEANFILES = $(driverman_DATA) fbdevhw.man
 
 fbdevhw.$(DRIVER_MAN_SUFFIX): fbdevhw.man
 	-rm -f fbdevhw.$(DRIVER_MAN_SUFFIX)
diff --git a/hw/xfree86/getconfig/Makefile.am b/hw/xfree86/getconfig/Makefile.am
index 1be01f933..8893a5520 100644
--- a/hw/xfree86/getconfig/Makefile.am
+++ b/hw/xfree86/getconfig/Makefile.am
@@ -31,16 +31,17 @@ dist_bin_SCRIPTS = getconfig getconfig.pl
 getconfigdir = $(libdir)/X11/getconfig
 dist_getconfig_DATA = xorg.cfg cfg.sample
 
-dist_man1_MANS = getconfig.man
+man1_MANS = getconfig.man
 
 include $(top_srcdir)/cpprules.in
 
 filemandir = $(mandir)/man$(FILE_MAN_SUFFIX)
 fileman_DATA = getconfig.$(FILE_MAN_SUFFIX)
-CLEANFILES = $(fileman_DATA)
 
 getconfig.$(FILE_MAN_SUFFIX): cfg.man
 	-rm -f getconfig.$(FILE_MAN_SUFFIX)
 	$(LN_S) cfg.man getconfig.$(FILE_MAN_SUFFIX)
 
-EXTRA_DIST = cfg.man.pre
+CLEANFILES = $(fileman_DATA) cfg.man getconfig.man
+
+EXTRA_DIST = cfg.man.pre getconfig.man.pre