diff --git a/src/gnome/.cvsignore b/src/gnome/.cvsignore
index 0349744410..2cf4ec5a2e 100644
--- a/src/gnome/.cvsignore
+++ b/src/gnome/.cvsignore
@@ -9,3 +9,4 @@ glade-support-gnc-dialogs.c
 #glade-cb-gnc-dialogs.h
 #glade-gnc-dialogs.h
 #glade-support-gnc-dialogs.h
+gnucash.keys
diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index 6d66e174fb..08aafb36b5 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -43,6 +43,11 @@ gnomeappdir = ${datadir}/gnome/apps/Applications
 
 gnomeapp_DATA = gnucash.desktop
 
+appicondir = $(datadir)/pixmaps
+
+mimedir = $(datadir)/mime-info
+mime_DATA = gnucash.keys gnucash.mime
+
 noinst_HEADERS = \
   account-tree.h \
   cursors.h \
@@ -92,9 +97,14 @@ GLADE_FILES = \
 EXTRA_DIST = \
   .cvsignore \
   gnc-dialogs.glade \
-  gnucash.desktop
+  gnucash.desktop \
+  gnucash.keys.in \
+  gnucash.mime
 
-CFLAGS = @CFLAGS@ ${G_WRAP_COMPILE_ARGS} ${GNOME_PRINT_CFLAGS} ${GTKHTML_CFLAGS}
+CFLAGS = @CFLAGS@ \
+         ${G_WRAP_COMPILE_ARGS} \
+         ${GNOME_PRINT_CFLAGS} \
+         ${GTKHTML_CFLAGS}
 
 INCLUDES = \
   -I${top_srcdir}/src \
@@ -106,3 +116,15 @@ INCLUDES = \
   -I${top_srcdir}/src/register/gnome \
   ${GNOME_INCLUDEDIR} \
   ${GUILE_INCS}
+
+
+## We borrow guile's convention and use @-...-@ as the substitution
+## brackets here, instead of the usual @...@.  This prevents autoconf
+## from substituting the values directly into the left-hand sides of
+## the sed substitutions.
+gnucash.keys: gnucash.keys.in
+	rm -f $@.tmp
+	sed < $@.in > $@.tmp \
+            -e 's:@-icondir-@:${appicondir}:g'
+	chmod +x $@.tmp
+	mv $@.tmp $@
diff --git a/src/gnome/gnucash.keys.in b/src/gnome/gnucash.keys.in
new file mode 100644
index 0000000000..aeb2aa7e00
--- /dev/null
+++ b/src/gnome/gnucash.keys.in
@@ -0,0 +1,3 @@
+application/x-gnucash:
+	open=gnucash %f
+	view=gnucash %f
diff --git a/src/gnome/gnucash.mime b/src/gnome/gnucash.mime
new file mode 100644
index 0000000000..67bb11df9a
--- /dev/null
+++ b/src/gnome/gnucash.mime
@@ -0,0 +1,2 @@
+application/x-gnucash
+	ext: xac gnc gnucash