diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 5b95a67a1..40201f921 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2004-07-28  Alex Roitman  <shura@alex.neuro.umn.edu>
+	* src/data/Makefile.am: Uninstall everything that we install.
+
 2004-07-27  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/RelLib.py, etc.: convert get_id to get_handle
 
diff --git a/gramps2/src/data/Makefile.am b/gramps2/src/data/Makefile.am
index aa30bf4f5..33a60d2bf 100644
--- a/gramps2/src/data/Makefile.am
+++ b/gramps2/src/data/Makefile.am
@@ -2,17 +2,18 @@
 SUBDIRS = templates
 pkgdatadir = $(datadir)/@PACKAGE@/data
 
-dist_pkgdata_DATA = gedcom.xml \
-	       papersize.xml \
-	       tips.xml \
-	       gnome-mime-application-x-gramps.png \
-           gnome-mime-application-x-gedcom.png \
-	       gnome-mime-application-x-gramps-package.png \
-	       gramps.applications \
-	       gramps.desktop \
-	       gramps.svg \
-	       gramps.keys \
-           gramps.mime
+dist_pkgdata_DATA = \
+	gedcom.xml \
+	papersize.xml \
+	tips.xml \
+	gnome-mime-application-x-gramps.png \
+	gnome-mime-application-x-gedcom.png \
+	gnome-mime-application-x-gramps-package.png \
+	gramps.applications \
+	gramps.desktop \
+	gramps.svg \
+	gramps.keys \
+	gramps.mime
 
 EXTRA_DIST = $(dist_pkgdata_DATA)
 
@@ -37,10 +38,12 @@ install-data-local:    install-schemas
 
 uninstall-local:
 	-rm $(DESTDIR)$(prefix)/share/gnome/apps/Applications/gramps.desktop
-	-rm $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-gramps.png
+	-rm $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-*.png
 	-rm $(DESTDIR)$(prefix)/share/mime-info/gramps.keys
 	-rm $(DESTDIR)$(prefix)/share/mime-info/gramps.mime
+	-rm $(DESTDIR)$(prefix)/share/application-registry/gramps.applications
 	-rm $(DESTDIR)$(prefix)/share/mime/packages/gramps.xml
 	-rm $(DESTDIR)/etc/gconf/schemas/gramps.schemas
+	update-mime-database $(DESTDIR)$(prefix)/share/mime
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
 		gconftool-2 --makefile-uninstall-rule gramps.schemas