diff --git a/ChangeLog b/ChangeLog
index d6b4eb40f..317950d07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2005-10-13  Kristian Høgsberg  <krh@redhat.com>
+
+	* hw/xfree86/xf4bpp/Makefile.am (libxf4bpp_la_SOURCES): Dist NOTES.
+
+	* hw/xfree86/xf1bpp/Makefile.am (EXTRA_DIST): Dist helper shell
+	scripts.
+
+	* hw/xfree86/xaa/Makefile.am (EXTRA_DIST): Dist XAA.HOWTO and a
+	few more unused C files.
+
+	* hw/xfree86/Makefile.am (EXTRA_DIST): Dist xorgconf.cpp.
+
+	* hw/xfree86/doc/Makefile.am (EXTRA_DIST): Fix DIST_EXTRA typo.
+
+	* hw/dmx/config/Makefile.am (MAINTAINERCLEANFILES): Clean yacc and
+	lex generated files only during make maintainer-clean as we don't
+	expect users to have those tools installed.
+
 2005-10-12  Eric Anholt  <anholt@FreeBSD.org>
 
 	* hw/xfree86/common/Makefile.am:
diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am
index 7b3b0eebc..0f837aa30 100644
--- a/hw/dmx/config/Makefile.am
+++ b/hw/dmx/config/Makefile.am
@@ -16,7 +16,7 @@ scanner.c: scanner.l parser.h
 
 BUILT_SOURCES = parser.c parser.h scanner.c
 
-CLEANFILES = $(BUILT_SOURCES)
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 
 libdmxconfig_a_SOURCES = $(LIBSRCS)
 
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 7c219400a..d350f72a3 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -69,3 +69,4 @@ if INSTALL_SETUID
 	chmod u+s $(DESTDIR)$(bindir)/Xorg
 endif
 
+EXTRA_DIST = xorgconf.cpp
diff --git a/hw/xfree86/doc/Makefile.am b/hw/xfree86/doc/Makefile.am
index 2bb75008e..ed87f0578 100644
--- a/hw/xfree86/doc/Makefile.am
+++ b/hw/xfree86/doc/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = devel man sgml
 
-DIST_EXTRA = \
+EXTRA_DIST = \
 	changelogs/CHANGELOG \
 	changelogs/CHANGELOG.ND \
 	changelogs/CHANGELOG.R5 \
diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am
index b5d4dee29..fb9ebe4b7 100644
--- a/hw/xfree86/xaa/Makefile.am
+++ b/hw/xfree86/xaa/Makefile.am
@@ -60,7 +60,8 @@ DISTCLEANFILES = $(POLYSEG) $(LSB_FIRST) $(LSB_FIXED) $(MSB_FIRST) $(MSB_FIXED)
 
 sdk_HEADERS = xaa.h xaalocal.h xaarop.h xaaWrapper.h
 EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \
-             xaaStipple.c xaaTEGlyph.c xaaBitmap.c
+             xaaStipple.c xaaTEGlyph.c xaaNonTEGlyph.c xaaBitmap.c \
+             xaaTEGlyphBlt.S XAA.HOWTO
 
 INCLUDES = $(XORG_INCS)
 
diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am
index 216467609..db5264cb0 100644
--- a/hw/xfree86/xf1bpp/Makefile.am
+++ b/hw/xfree86/xf1bpp/Makefile.am
@@ -150,3 +150,5 @@ mfbtileC.c:
 mfbtileG.c:
 	echo "#define MRop M0" > $@
 	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
+
+EXTRA_DIST = mfbmap.sh mfbunmap.sh 
diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am
index 8d4d2f72a..7a9dc3a9c 100644
--- a/hw/xfree86/xf4bpp/Makefile.am
+++ b/hw/xfree86/xf4bpp/Makefile.am
@@ -49,7 +49,7 @@ libxf4bpp_la_SOURCES = \
 libxf4bpp_la_LIBADD = ../xf1bpp/libxf1bpp.la
 
 EXTRA_DIST = OScompiler.h ibmTrace.h ppcGCstr.h ppcSpMcro.h vgaReg.h \
-             vgaVideo.h wm3.h
+             vgaVideo.h wm3.h NOTES
 
 DISTCLEANFILES = mfbseg.c