diff --git a/share/Makefile.am b/share/Makefile.am
index cc3a9da..ce4ad42 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,2 +1,8 @@
 Applicationsdir = $(datadir)/applications
 Applications_DATA = tomb.desktop
+
+AppRegdir = $(datadir)/application-registry
+AppReg_DATA = tomb.applications
+
+MimeInfodir = $(datadir)/mime-info
+MimeInfo_DATA = tomb.keys tomb.mime
diff --git a/share/tomb.applications b/share/tomb.applications
new file mode 100644
index 0000000..34f5014
--- /dev/null
+++ b/share/tomb.applications
@@ -0,0 +1,7 @@
+tomb
+         command=tomb-open
+         name=Tomb - Crypto Undertaker
+         can_open_multiple_files=false
+         expects_uris=false
+         requires_terminal=false
+         mime-types=application/x-tomb-volume,application/x-tomb-key
diff --git a/share/tomb.keys b/share/tomb.keys
new file mode 100644
index 0000000..d7ab551
--- /dev/null
+++ b/share/tomb.keys
@@ -0,0 +1,6 @@
+# actions for encrypted tomb storage
+application/x-tomb-volume:
+	open=tomb-open %f
+	view=tomb-open %f
+	icon-filename=monmort.xpm
+        short_list_application_ids_for_novice_user_level=tomb
diff --git a/share/tomb.mime b/share/tomb.mime
new file mode 100644
index 0000000..87ff025
--- /dev/null
+++ b/share/tomb.mime
@@ -0,0 +1,6 @@
+# mime type for encrypted tomb storage
+application/x-tomb-volume
+	ext: tomb
+
+application/x-tomb-key
+        ext: tomb.gpg
diff --git a/src/Makefile.am b/src/Makefile.am
index 4292c04..91a8614 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,5 +12,5 @@ tomb_askpass_LDADD = @GTK2_LIBS@
 tomb_askpass_CFLAGS = @GTK2_CFLAGS@
 
 EXTRA_DIST = monmort.xpm
-pixmapdir = $(prefix)/share/pixmaps
+pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = monmort.xpm