diff --git a/configure.ac b/configure.ac
index 9e029d4..d357044 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,7 @@ dnl alphabetic order on dir/subdir, but Makefile sorts before everything
 AC_CONFIG_FILES([
 Makefile
 src/Makefile
+share/Makefile
 ])
 AC_OUTPUT
 
diff --git a/share/Makefile.am b/share/Makefile.am
new file mode 100644
index 0000000..cc3a9da
--- /dev/null
+++ b/share/Makefile.am
@@ -0,0 +1,2 @@
+Applicationsdir = $(datadir)/applications
+Applications_DATA = tomb.desktop
diff --git a/share/tomb.desktop b/share/tomb.desktop
new file mode 100644
index 0000000..9dc35de
--- /dev/null
+++ b/share/tomb.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Tomb crypto undertaker
+GenericName=Crypto undertaker
+Comment=Keep your bones safe
+Exec=tomb-open %U
+TryExec=tomb-open
+Icon=monmort.xpm
+Terminal=false
+Categories=Utility;Security;Archiving;Filesystem;
+MimeType=application/x-tomb-volume;
+EOF
diff --git a/share/tomb.keys b/share/tomb.keys
deleted file mode 100644
index a20c86a..0000000
--- a/share/tomb.keys
+++ /dev/null
@@ -1,6 +0,0 @@
-# actions for encrypted tomb storage
-
-application/x-tomb:
-	open=tomb auto %f
-	view=tomb auto %f
-	icon-filename=${prefix}/share/icons/tomb.png
diff --git a/share/tomb.mime b/share/tomb.mime
deleted file mode 100644
index f2a2614..0000000
--- a/share/tomb.mime
+++ /dev/null
@@ -1,4 +0,0 @@
-# mime type for encrypted tomb storage
-
-application/x-tomb
-	ext: tomb
diff --git a/src/Makefile.am b/src/Makefile.am
index 2aeb264..f6086c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,3 +10,7 @@ tomb_status_CXXFLAGS = @GTK2_CFLAGS@ @NOTIFY_CFLAGS@
 tomb_notify_SOURCES = tomb-notify.cpp
 tomb_notify_LDADD = @NOTIFY_LIBS@
 tomb_notify_CXXFLAGS = @NOTIFY_CFLAGS@
+
+EXTRA_DIST = monmort.xpm
+pixmapdir = $(prefix)/share/pixmaps
+pixmap_DATA = monmort.xpm