diff --git a/resources/openlp.desktop b/resources/openlp.desktop
index 684119773..07398ede8 100755
--- a/resources/openlp.desktop
+++ b/resources/openlp.desktop
@@ -3,11 +3,11 @@ Categories=AudioVideo;
 Comment[de]=
 Comment=
 Encoding=UTF-8
-Exec=openlp
+Exec=openlp %F
 GenericName[de]=Church lyrics projection
 GenericName=Church lyrics projection
 Icon=openlp
-MimeType=
+MimeType=application/x-openlp-service;
 Name[de]=OpenLP
 Name=OpenLP
 Path=
diff --git a/resources/openlp.xml b/resources/openlp.xml
new file mode 100644
index 000000000..215fa2b6e
--- /dev/null
+++ b/resources/openlp.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+It comes with ABSOLUTELY NO WARRANTY, to the extent permitted by law. You may
+redistribute copies of update-mime-database under the terms of the GNU General
+Public License. For more information about these matters, see the file named
+COPYING.
+-->
+<!--
+Notes:
+- the mime types in this file are valid with the version 0.30 of the
+  shared-mime-info package.
+- the "fdo #xxxxx" are the wish in the freedesktop.org bug database to include
+  the mime type there.
+--> 
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-openlp-service">
+    <sub-class-of type="application/zip"/>
+    <comment>OpenLP Service File</comment>
+    <glob pattern="*.osz"/>
+  </mime-type> 
+  <mime-type type="application/x-openlp-theme">
+    <sub-class-of type="application/zip"/>
+    <comment>OpenLP Theme File</comment>
+    <glob pattern="*.otz"/>
+  </mime-type> 
+</mime-info>