diff --git a/ChangeLog b/ChangeLog
index 9cf27ae4a..989c19176 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-12-05  Alex Roitman  <shura@alex.neuro.umn.edu>
+	* doc/Makefile.am: Remove unneeded CLEANFILES, they're defined below.
+	* doc/xmldocs.make: Add Makefile to CLEANFILES; Explictly clean 
+	stuff in distclean-hook.
+	* src/Makefile.am: Remove gramps.desktop from GRAPHICS.
+	* src/data/Makefile.am: Remove EXTRA_DIST; split files that do not
+	need to be in $PREFIX/share/gramps into dist_data_DATA: they're
+	installed explicitly to the proper locations anyway, and this is
+	only needed for distribution.
+
 2004-12-05  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/DateParser.py: documenation enhancements
 	* src/GrampsBSDDB.py: Add cursor class
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 395698cbf..c4a0e0869 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,4 +10,4 @@ EXTRA_DIST = $(man_MANS) $(man_IN_FILES) xmldocs.make omf.make
 gramps.1: $(top_builddir)/config.status gramps.1.in
 	cd $(top_builddir) && CONFIG_FILES=doc/$@ $(SHELL) ./config.status
 
-CLEANFILES=$(man_MANS) $(SUBDIRS)/*/*.out $(SUBDIRS)/*/omf_timestamp
+CLEANFILES=$(man_MANS)
diff --git a/doc/xmldocs.make b/doc/xmldocs.make
index 80d3ed803..cd49aec8a 100644
--- a/doc/xmldocs.make
+++ b/doc/xmldocs.make
@@ -43,7 +43,7 @@ xml_files = $(entities) $(docname).xml
 omf_dir=$(top_srcdir)/omf-install
 
 EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp
+CLEANFILES = omf_timestamp Makefile
 
 include $(top_srcdir)/doc/omf.make
 
@@ -61,6 +61,7 @@ distclean-hook:
 	then \
 	  rm -f $(entities); \
 	fi
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 app-dist-hook:
 	if test "$(figdir)"; then \
diff --git a/src/Makefile.am b/src/Makefile.am
index e2b9b7e8b..f69bc3336 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -129,7 +129,6 @@ GRAPHICS = \
 	home.png\
 	logo.png\
 	gramps.png \
-	gramps.desktop \
 	media.png\
 	people48.png\
 	place.png\
diff --git a/src/data/Makefile.am b/src/data/Makefile.am
index 612f283da..8bb061bfb 100644
--- a/src/data/Makefile.am
+++ b/src/data/Makefile.am
@@ -5,21 +5,22 @@ pkgdatadir = $(datadir)/@PACKAGE@/data
 dist_pkgdata_DATA = \
 	gedcom.xml \
 	papersize.xml \
-	tips.xml \
+	tips.xml
+
+dist_data_DATA = \
+	gramps.desktop \
 	gnome-mime-application-x-gramps.png \
 	gnome-mime-application-x-gedcom.png \
 	gnome-mime-application-x-gramps-package.png \
 	gnome-mime-application-x-gramps-xml.png \
 	gnome-mime-application-x-geneweb.png \
-	gramps.applications \
 	gramps.svg \
+	gramps.xml \
+	gramps.applications \
 	gramps.keys \
 	gramps.mime \
-	gramps.xml \
 	gramps.schemas
 
-EXTRA_DIST = $(dist_pkgdata_DATA)
-
 install-schemas:
 	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/gconf/schemas
 	$(INSTALL_DATA) $(top_srcdir)/src/data/gramps.schemas $(DESTDIR)$(sysconfdir)/gconf/schemas