diff --git a/encryptpad.desktop b/encryptpad.desktop
new file mode 100644
index 00000000..b7f4c0a4
--- /dev/null
+++ b/encryptpad.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=EncryptPad
+Comment=Secure text editor and binary encryptor
+Icon=encryptpad
+Exec=EncryptPad %f
+Categories=Utility;TextEditor;
+StartupNotify=false
+Terminal=false
+MimeType=application/x-encryptpad
diff --git a/encryptpad.xml b/encryptpad.xml
new file mode 100644
index 00000000..a117e488
--- /dev/null
+++ b/encryptpad.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="application/x-encryptpad">
+    <comment>EncryptPad file</comment>
+    <glob pattern="*.epd"/>
+    <icon name="encryptpad"/>
+  </mime-type>
+</mime-info>