diff --git a/Makefile.am b/Makefile.am
index f28bd5533..67b4d6c07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-# copyright (C) 2000 Sun Microsystems, Inc.
-
 SUBDIRS = src doc example
 
 EXTRA_DIST = autogen.sh gramps.spec.in gramps.spec gramps-mdk.spec gramps-mdk.spec.in COPYING-DOCS FAQ
diff --git a/Makefile.in b/Makefile.in
index 2140346aa..5fef1bb88 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,8 +14,6 @@
 
 @SET_MAKE@
 
-# copyright (C) 2000 Sun Microsystems, Inc.
-
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
diff --git a/src/Makefile.am b/src/Makefile.am
index 98cb2603c..433ef93b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -108,8 +108,8 @@ GRAPHICS = \
 	family48.png\
 	good.png\
 	home.png\
-	gramps.png\
 	logo.png\
+	gramps.png \
 	media.png\
 	people48.png\
 	place.png\
diff --git a/src/Makefile.in b/src/Makefile.in
index ef8b30662..36ec42754 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -248,8 +248,8 @@ GRAPHICS = \
 	family48.png\
 	good.png\
 	home.png\
-	gramps.png\
 	logo.png\
+	gramps.png \
 	media.png\
 	people48.png\
 	place.png\
diff --git a/src/data/Makefile.am b/src/data/Makefile.am
index 64464bca2..03c90d5a1 100644
--- a/src/data/Makefile.am
+++ b/src/data/Makefile.am
@@ -7,6 +7,7 @@ pkgdata_DATA = gedcom.xml \
 	       tips.xml \
 	       gnome-mime-application-x-gramps.png \
 	       gramps.applications \
+	       gramps.desktop \
 	       gramps.svg \
 	       gramps.keys \
                gramps.mime
@@ -14,8 +15,6 @@ pkgdata_DATA = gedcom.xml \
 EXTRA_DIST = $(pkgdata_DATA)
 
 install-data-local:
-	$(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps
-	$(INSTALL_DATA) gramps.png $(DESTDIR)$(prefix)/share/pixmaps
 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications
 	$(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/applications
 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
@@ -29,7 +28,6 @@ install-data-local:
 	update-mime-database $(DESTDIR)$(prefix)/share/mime
 
 uninstall-local:
-	-rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png
 	-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/mime-info/gramps.keys
diff --git a/src/data/Makefile.in b/src/data/Makefile.in
index a1df01ca9..4b75af538 100644
--- a/src/data/Makefile.in
+++ b/src/data/Makefile.in
@@ -142,6 +142,7 @@ pkgdata_DATA = gedcom.xml \
 	       tips.xml \
 	       gnome-mime-application-x-gramps.png \
 	       gramps.applications \
+	       gramps.desktop \
 	       gramps.svg \
 	       gramps.keys \
                gramps.mime
@@ -453,8 +454,6 @@ uninstall-info: uninstall-info-recursive
 
 
 install-data-local:
-	$(INSTALL) -d $(DESTDIR)$(prefix)/share/pixmaps
-	$(INSTALL_DATA) gramps.png $(DESTDIR)$(prefix)/share/pixmaps
 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/gnome/apps/Applications
 	$(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/applications
 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
@@ -468,7 +467,6 @@ install-data-local:
 	update-mime-database $(DESTDIR)$(prefix)/share/mime
 
 uninstall-local:
-	-rm $(DESTDIR)$(prefix)/share/pixmaps/gramps.png
 	-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/mime-info/gramps.keys
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index 96071b92a..1775e7bce 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -190,7 +190,6 @@ GLADEFILES = \
 	gedcomimport.glade\
 	merge.glade\
 	patchnames.glade\
-	pkgexport.glade\
 	relcalc.glade\
 	soundex.glade\
 	summary.glade\