diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 4ec427764..2e7a8737b 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2004-05-27  Don Allingham  <dallingham@users.sourceforge.net>
+	* various: installation fixes
+
 2004-05-26  Don Allingham  <dallingham@users.sourceforge.net>
 	* Makefiles: updated for installation
 	* src/data/gnome-mime-application-x-gramps.png: new icon
diff --git a/gramps2/gramps-mdk.spec b/gramps2/gramps-mdk.spec
index acdcd037a..09d7097c3 100644
--- a/gramps2/gramps-mdk.spec
+++ b/gramps2/gramps-mdk.spec
@@ -1,5 +1,5 @@
 %define ver      1.1.0
-%define rel      0.CVS20040525
+%define rel      0.CVS20040526
 %define prefix   /usr
 %define localstatedir /var/lib
 # Ensure that internal RPM macros for configure & makeinstall 
diff --git a/gramps2/gramps.spec b/gramps2/gramps.spec
index 583c68b13..995c8c7b3 100644
--- a/gramps2/gramps.spec
+++ b/gramps2/gramps.spec
@@ -1,5 +1,5 @@
 %define ver      1.1.0
-%define rel      0.CVS20040525
+%define rel      0.CVS20040526
 %define prefix   /usr
 %define localstatedir /var/lib
 # Ensure that internal RPM macros for configure & makeinstall 
diff --git a/gramps2/src/data/Makefile.am b/gramps2/src/data/Makefile.am
index c773bee60..000ca8142 100644
--- a/gramps2/src/data/Makefile.am
+++ b/gramps2/src/data/Makefile.am
@@ -6,7 +6,10 @@ pkgdata_DATA = gedcom.xml \
 	       papersize.xml \
 	       tips.xml \
 	       gnome-mime-application-x-gramps.png \
-	       gramps.svg
+	       gramps.applications \
+	       gramps.svg \
+	       gramps.keys \
+               gramps.mime
 
 EXTRA_DIST = $(pkgdata_DATA)
 
@@ -14,15 +17,22 @@ 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/gnome/apps/Applications
+	$(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/applications
 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
 	$(INSTALL_DATA) gnome-mime-application-x-gramps.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/application-registry
+	$(INSTALL_DATA) gramps.applications $(DESTDIR)$(prefix)/share/application-registry
 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/mime/packages
 	$(INSTALL_DATA) gramps.xml $(DESTDIR)$(prefix)/share/mime/packages
 	update-mime-database $(DESTDIR)$(prefix)/share/mime
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/mime-info
+	$(INSTALL_DATA) gramps.keys gramps.mime $(DESTDIR)$(prefix)/share/mime-info
 
 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
+	-rm $(DESTDIR)$(prefix)/share/mime-info/gramps.mime
+	-rm $(DESTDIR)$(prefix)/share/mime/packages/gramps.xml
 
diff --git a/gramps2/src/data/Makefile.in b/gramps2/src/data/Makefile.in
index 5db644715..9ee3aeb01 100644
--- a/gramps2/src/data/Makefile.in
+++ b/gramps2/src/data/Makefile.in
@@ -141,6 +141,7 @@ pkgdata_DATA = gedcom.xml \
 	       papersize.xml \
 	       tips.xml \
 	       gnome-mime-application-x-gramps.png \
+	       gramps.applications\
 	       gramps.svg
 
 EXTRA_DIST = $(pkgdata_DATA)
@@ -453,9 +454,11 @@ 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/gnome/apps/Applications
+	$(INSTALL_DATA) gramps.desktop $(DESTDIR)$(prefix)/share/applications
 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
 	$(INSTALL_DATA) gnome-mime-application-x-gramps.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
+	$(INSTALL) -d $(DESTDIR)$(prefix)/share/application-registry
+	$(INSTALL_DATA) gramps.applications $(DESTDIR)$(prefix)/share/application-registry
 	$(INSTALL) -d $(DESTDIR)$(prefix)/share/mime/packages
 	$(INSTALL_DATA) gramps.xml $(DESTDIR)$(prefix)/share/mime/packages
 	update-mime-database $(DESTDIR)$(prefix)/share/mime
diff --git a/gramps2/src/data/gnome-mime-application-x-gramps.png b/gramps2/src/data/gnome-mime-application-x-gramps.png
index 3ec55752b..0d8291649 100644
Binary files a/gramps2/src/data/gnome-mime-application-x-gramps.png and b/gramps2/src/data/gnome-mime-application-x-gramps.png differ
diff --git a/gramps2/src/data/gramps.applications b/gramps2/src/data/gramps.applications
new file mode 100644
index 000000000..d6b54807c
--- /dev/null
+++ b/gramps2/src/data/gramps.applications
@@ -0,0 +1,7 @@
+gramps
+	command=gramps
+	name=GRAMPS
+	can_open_multiple_files=false
+	expects_uris=false
+	requires_terminal=false
+	mime_types=application/x-gramps,application/x-gedcom
diff --git a/gramps2/src/data/gramps.keys b/gramps2/src/data/gramps.keys
new file mode 100644
index 000000000..6b2f90996
--- /dev/null
+++ b/gramps2/src/data/gramps.keys
@@ -0,0 +1,10 @@
+application/x-gramps:
+	description=GRAMPS database
+	default_action_type=appliction
+	short_list_application_ids=gramps
+	short_list_application_ids_for_novice_user_level=gramps
+	short_list_application_ids_for_intermediate_user_level=gramps
+	short_list_application_ids_for_advanced_user_level=gramps
+	category=Documents/Genealogy
+	icon-filename=/usr/share/gramps/gramps.png
+	open=gramps %f
diff --git a/gramps2/src/data/gramps.mime b/gramps2/src/data/gramps.mime
new file mode 100644
index 000000000..50d74f01c
--- /dev/null
+++ b/gramps2/src/data/gramps.mime
@@ -0,0 +1,3 @@
+application/x-gramps
+	ext: grdb
+
diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade
index c05c0e323..d3f126edb 100644
--- a/gramps2/src/gramps.glade
+++ b/gramps2/src/gramps.glade
@@ -31390,4 +31390,64 @@
   </child>
 </widget>
 
+<widget class="GtkWindow" id="splash">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">window1</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">True</property>
+  <property name="resizable">False</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">False</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+
+  <child>
+    <widget class="GtkVBox" id="vbox79">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+	<widget class="GtkImage" id="image2024">
+	  <property name="visible">True</property>
+	  <property name="pixbuf">splash.jpg</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkLabel" id="label396">
+	  <property name="visible">True</property>
+	  <property name="label" translatable="yes">&lt;span size=&quot;larger&quot;&gt;Starting GRAMPS...&lt;/span&gt;</property>
+	  <property name="use_underline">False</property>
+	  <property name="use_markup">True</property>
+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+	  <property name="wrap">False</property>
+	  <property name="selectable">False</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>
diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py
index a363a45bb..c937a0f71 100755
--- a/gramps2/src/gramps_main.py
+++ b/gramps2/src/gramps_main.py
@@ -58,6 +58,7 @@ import FamilyView
 import SourceView
 import PeopleView
 import GenericFilter
+import GrampsMime
 import DisplayTrace
 import const
 import Plugins
@@ -135,12 +136,20 @@ class Gramps:
         GrampsCfg.loadConfig(self.pref_callback)
         self.RelClass = Plugins.relationship_class
         self.relationship = self.RelClass(self.db)
+        self.gtop = gtk.glade.XML(const.gladeFile, "gramps", "gramps")
         self.init_interface()
 
         if GrampsCfg.usetips:
             TipOfDay.TipOfDay()
 
-        if args:
+        if args and len(args)==1:
+            if GrampsMime.get_type(args[0]) == "application/x-gramps":
+                if self.auto_save_load(args[0]) == 0:
+                    DbPrompter.DbPrompter(self,0,self.topWindow)
+            else:
+                import ArgHandler
+                ArgHandler.ArgHandler(self,args)
+        elif args:
             import ArgHandler
             ArgHandler.ArgHandler(self,args)
         elif GrampsCfg.lastfile and GrampsCfg.autoload:
@@ -163,7 +172,6 @@ class Gramps:
         widgets that it will need.
         """
 
-        self.gtop = gtk.glade.XML(const.gladeFile, "gramps", "gramps")
         self.topWindow   = self.gtop.get_widget("gramps")
 
         self.report_button = self.gtop.get_widget("reports")