diff --git a/Makefile b/Makefile
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/files/cryptomator.desktop b/files/cryptomator.desktop
new file mode 100644
--- /dev/null
+++ b/files/cryptomator.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Cryptomator
+Comment=Cloud Storage Encryption Utility
+Exec=/usr/bin/cryptomator
+Icon=cryptomator
+Terminal=false
+Type=Application
+Categories=Utility
+MimeType=application/x-vnd.cryptomator-vault-metadata
+
diff --git a/files/cryptomator.sh b/files/cryptomator.sh
new file mode 100644
--- /dev/null
+++ b/files/cryptomator.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec "/usr/bin/java" -jar /usr/share/java/cryptomator/cryptomator.jar "$@"
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,24 @@
+name       : cryptomator
+version    : 1.3.3
+release    : 1
+source     :
+    - https://github.com/cryptomator/cryptomator/archive/1.3.3.tar.gz : b87d13b83d19e50e73e043163bb3917324a8641aaa768b099d24c712d423d0a1
+license    : MIT
+component  : security.crypto
+summary    : Client-side encryption of your files in the cloud
+description: |
+    Multi-platform transparent client-side encryption of your files in the cloud
+networking : yes
+builddeps  :
+    - apache-maven
+    - openjfx-8
+rundeps    :
+    - openjfx-8
+build      : |
+    cd main
+    mvn clean install -Prelease -Dmaven.repo.local=$workdir/repo
+install    : |
+    install -Dm644 main/uber-jar/target/Cryptomator-*.jar $installdir/usr/share/java/cryptomator/cryptomator.jar
+    install -Dm755 $pkgfiles/cryptomator.sh $installdir/usr/bin/cryptomator
+    install -Dm644 main/ant-kit/src/main/resources/package/linux/Cryptomator.png $installdir/usr/share/pixmaps/cryptomator.png
+    install -Dm644 $pkgfiles/cryptomator.desktop $installdir/usr/share/applications/cryptomator.desktop
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
new file mode 100644
--- /dev/null
+++ b/pspec_x86_64.xml
@@ -0,0 +1,37 @@
+<PISI>
+    <Source>
+        <Name>cryptomator</Name>
+        <Packager>
+            <Name>Sönke Behrendt</Name>
+            <Email>thesoenke@outlook.com</Email>
+        </Packager>
+        <License>MIT</License>
+        <PartOf>security.crypto</PartOf>
+        <Summary xml:lang="en">Client-side encryption of your files in the cloud</Summary>
+        <Description xml:lang="en">Multi-platform transparent client-side encryption of your files in the cloud
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>cryptomator</Name>
+        <Summary xml:lang="en">Client-side encryption of your files in the cloud</Summary>
+        <Description xml:lang="en">Multi-platform transparent client-side encryption of your files in the cloud
+</Description>
+        <PartOf>security.crypto</PartOf>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="data">/usr/share/applications/cryptomator.desktop</Path>
+            <Path fileType="data">/usr/share/java/cryptomator/cryptomator.jar</Path>
+            <Path fileType="data">/usr/share/pixmaps/cryptomator.png</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2017-12-08</Date>
+            <Version>1.3.3</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Sönke Behrendt</Name>
+            <Email>thesoenke@outlook.com</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file