diff --git a/src/MAINTAINERS.md b/src/MAINTAINERS.md
new file mode 100644
index 0000000..5ae5813
--- /dev/null
+++ b/src/MAINTAINERS.md
@@ -0,0 +1,6 @@
+This file is used to indicate responsibility for the maintenance of this package. Individuals on this list should be the sole modifiers of the package, excluding cases where the Solus Team may need to perform necessary rebuilds, upgrades, or security fixes. This list should not be used for any direct contact usage. If you believe this package requires a package update, follow documentation from https://getsol.us/articles/packaging/request-a-package-update/en/. In the event this package no longer becomes sufficiently maintained, Core Team reserves the right to request a new maintainer or remove this package from the repository.
+	
+    - Alexander Zhirov
+    - IRC: alexanderzhirov
+    - Telegram: @alexanderzhirov
+    - Email: alexander@zhirov.website
diff --git a/src/files/davmail b/src/files/davmail
new file mode 100644
index 0000000..44ca627
--- /dev/null
+++ b/src/files/davmail
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+JAVA_OPTS="-Xmx512M -Dsun.net.inetaddr.ttl=60 -Djdk.gtk.version=2.2"
+
+if [ -z "$JAVA_HOME" ]; then
+    export JAVA_HOME=/usr/lib64/openjdk-8
+fi
+
+if [ -z "$JAVA" ]; then
+    export JAVA=$JAVA_HOME/bin/java
+fi
+
+exec ${JAVA} $JAVA_OPTS -cp /usr/share/davmail/davmail.jar:/usr/share/davmail/lib/* davmail.DavGateway "$@"
diff --git a/src/package.yml b/src/package.yml
index e265679..34e2196 100644
--- a/src/package.yml
+++ b/src/package.yml
@@ -3,31 +3,29 @@ 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
+homepage   : davmail.sourceforge.net
+license    : GPL-2.0-or-later
 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   : davmail.sourceforge.net
 networking : true
 builddeps  :
-    - openjdk-8
     - apache-ant
+    - openjfx-8
     - unzip
 rundeps    :
     - openjdk-8
 build      : |
     JAVA_HOME=/usr/lib64/openjdk-8 ant
 install    : |
-    install -D -d -m 00755 $installdir/usr/share/davmail/lib
+    install -dm00644 $installdir/usr/share/davmail/lib
     unzip -q $(find dist/ -name "davmail-*-trunk.zip" -type f) -d source/
-    install -m 00644 source/lib/* $installdir/usr/share/davmail/lib/
-    install -m 00644 source/davmail.jar $installdir/usr/share/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/
+    install -m00644 source/lib/* $installdir/usr/share/davmail/lib/
+    install -m00644 source/davmail.jar $installdir/usr/share/davmail/
+    install -Dm00644 src/icon/davmail.png $installdir/usr/share/icons/hicolor/128x128/apps/davmail.png
+    install -Dm00644 src/desktop/davmail.desktop $installdir/usr/share/applications/davmail.desktop
+    install -Dm00644 src/appstream/org.davmail.DavMail.appdata.xml $installdir/usr/share/metainfo/org.davmail.DavMail.appdata.xml
+    
+    # Install custom executable file with proper path of execute
+    install -Dm00755 $pkgfiles/davmail $installdir/usr/bin/davmail
diff --git a/src/pspec_x86_64.xml b/src/pspec_x86_64.xml
index 06ea014..5a4cd0b 100644
--- a/src/pspec_x86_64.xml
+++ b/src/pspec_x86_64.xml
@@ -6,7 +6,7 @@
             <Name>Alexander Zhirov</Name>
             <Email>alexander@zhirov.website</Email>
         </Packager>
-        <License>GPL-2.0-only</License>
+        <License>GPL-2.0-or-later</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.