diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..0a42375
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/package.yml b/package.yml
new file mode 100644
index 0000000..b187a2c
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,36 @@
+name       : davmail
+version    : 6.0.0
+release    : 1
+source     :
+    - https://sourceforge.net/projects/davmail/files/davmail/6.0.0/davmail-src-6.0.0-3375.tgz/download : 2d719188671f7a621c82ce7bc6d1d781ed18c8d52a9af23e7bc5288df2b649a5
+license    : GPL-2.0-only
+component  : network.mail
+summary    : DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange and Office 365 Gateway
+description: |
+    DavMail is a POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange and Office 365 Gateway allowing users to use any mail/calendar client (e.g. Thunderbird with Lightning or Apple iCal) with an Exchange server, even from the internet or behind a firewall through Outlook Web Access. DavMail now includes an LDAP gateway to Exchange global address book and user personal contacts to allow recipient address completion in mail compose window and full calendar support with attendees free/busy display.
+homepage   : |
+    http://davmail.sourceforge.net/
+networking : true
+builddeps  :
+    - openjdk-8
+    - apache-ant
+    - unzip
+rundeps    :
+    - openjdk-8
+build      : |
+    JAVA_HOME=/usr/lib64/openjdk-8 ant
+install    : |
+    install -D -d -m 00755 $installdir/opt/davmail/lib
+    unzip -q $(find dist/ -name "davmail-*-trunk.zip" -type f) -d source/
+    install -m 00644 source/lib/* $installdir/opt/davmail/lib/
+    install -m 00644 source/davmail.jar $installdir/opt/davmail/
+    sed -i -e 's:/usr/share/davmail/:/opt/davmail/:g' source/davmail
+    install -D -d -m 00755 $installdir/usr/bin
+    install -m 00755 source/davmail $installdir/usr/bin/davmail
+    install -D -d -m 00755 $installdir/usr/share/icons/hicolor/128x128/apps
+    install -m 00644 src/icon/davmail.png $installdir/usr/share/icons/hicolor/128x128/apps/
+    install -D -d -m 00755 $installdir/usr/share/applications
+    install -m 00644 src/desktop/davmail.desktop $installdir/usr/share/applications/
+    install -D -d -m 00755 $installdir/usr/share/metainfo
+    install -m 00644 src/appstream/org.davmail.DavMail.appdata.xml $installdir/usr/share/metainfo/
+    
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
new file mode 100644
index 0000000..8528c59
--- /dev/null
+++ b/pspec_x86_64.xml
@@ -0,0 +1,61 @@
+<PISI>
+    <Source>
+        <Name>davmail</Name>
+        <Homepage>http://davmail.sourceforge.net/
+</Homepage>
+        <Packager>
+            <Name>Alexander Zhirov</Name>
+            <Email>alexander@zhirov.website</Email>
+        </Packager>
+        <License>GPL-2.0-only</License>
+        <PartOf>network.mail</PartOf>
+        <Summary xml:lang="en">DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange and Office 365 Gateway</Summary>
+        <Description xml:lang="en">DavMail is a POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange and Office 365 Gateway allowing users to use any mail/calendar client (e.g. Thunderbird with Lightning or Apple iCal) with an Exchange server, even from the internet or behind a firewall through Outlook Web Access. DavMail now includes an LDAP gateway to Exchange global address book and user personal contacts to allow recipient address completion in mail compose window and full calendar support with attendees free/busy display.
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>davmail</Name>
+        <Summary xml:lang="en">DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange and Office 365 Gateway</Summary>
+        <Description xml:lang="en">DavMail is a POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange and Office 365 Gateway allowing users to use any mail/calendar client (e.g. Thunderbird with Lightning or Apple iCal) with an Exchange server, even from the internet or behind a firewall through Outlook Web Access. DavMail now includes an LDAP gateway to Exchange global address book and user personal contacts to allow recipient address completion in mail compose window and full calendar support with attendees free/busy display.
+</Description>
+        <PartOf>network.mail</PartOf>
+        <Files>
+            <Path fileType="data">/opt/davmail/davmail.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/activation-1.1.1.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/commons-codec-1.11.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/commons-collections-3.1.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/commons-logging-1.0.4.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/htmlcleaner-2.21.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/httpclient-4.5.6.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/httpcore-4.4.10.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/jackrabbit-webdav-2.14.6.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/jacocoant-0.8.5.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/javax.mail-1.5.6.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/jcharset-2.0.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/jcifs-1.3.14.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/jdom-1.0.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/jettison-1.4.0.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/log4j-1.2.16.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/slf4j-api-1.7.25.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/slf4j-log4j12-1.7.25.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/sonarqube-ant-task-2.7.0.1612.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/stax-api-1.0.1.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/stax2-api-3.1.1.jar</Path>
+            <Path fileType="data">/opt/davmail/lib/woodstox-core-6.2.0.jar</Path>
+            <Path fileType="executable">/usr/bin/davmail</Path>
+            <Path fileType="data">/usr/share/applications/davmail.desktop</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/128x128/apps/davmail.png</Path>
+            <Path fileType="data">/usr/share/metainfo/org.davmail.DavMail.appdata.xml</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2021-10-21</Date>
+            <Version>6.0.0</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Alexander Zhirov</Name>
+            <Email>alexander@zhirov.website</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file