diff --git a/README.md b/README.md
new file mode 100644
index 0000000..7927b9d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# DavMail installation package to Solus Project
+
+[DavMail](http://davmail.sourceforge.net/) 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 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.
+
+![davmailArchitecture](https://davmail.sourceforge.net/images/davmailArchitecture.png)
diff --git a/files/davmail b/files/davmail
new file mode 100644
index 0000000..8019d6e
--- /dev/null
+++ b/files/davmail
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+JAVA_OPTS="-Xmx512M -Dsun.net.inetaddr.ttl=60 --add-exports java.base/sun.net.www.protocol.https=ALL-UNNAMED"
+
+if [ -z "$JAVA_HOME" ]; then
+    export JAVA_HOME=/usr/lib64/openjdk-21
+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/files/davmail.service b/files/davmail.service
new file mode 100644
index 0000000..ed12556
--- /dev/null
+++ b/files/davmail.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=Davmail Exchange gateway
+Documentation=http://davmail.sourceforge.net/serversetup.html
+Documentation=http://davmail.sourceforge.net/advanced.html
+Documentation=http://davmail.sourceforge.net/sslsetup.html
+After=network.target
+
+[Service]
+Type=simple
+User=davmail
+PermissionsStartOnly=true
+AmbientCapabilities=CAP_NET_BIND_SERVICE
+ExecStart=/usr/bin/davmail -server /etc/davmail.properties
+StateDirectory=davmail
+SuccessExitStatus=143
+PrivateTmp=yes
+ProtectSystem=full
+ProtectHome=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/davmail.sysusers b/files/davmail.sysusers
new file mode 100644
index 0000000..b8dd2da
--- /dev/null
+++ b/files/davmail.sysusers
@@ -0,0 +1 @@
+u     davmail    -  "DavMail Exchange and Office 365 Gateway"  -      -
diff --git a/files/davmail.tmpfiles b/files/davmail.tmpfiles
new file mode 100644
index 0000000..640d5d8
--- /dev/null
+++ b/files/davmail.tmpfiles
@@ -0,0 +1 @@
+f /var/log/davmail.log 0640 davmail davmail -
diff --git a/package.yml b/package.yml
new file mode 100644
index 0000000..c134f3c
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,38 @@
+name       : davmail
+version    : 6.3.0
+release    : 8
+source     :
+    - https://github.com/mguessan/davmail/archive/refs/tags/6.3.0.tar.gz : 01059e4792fcd4eb9a46e2a27be9b82f037a4c5c93763536ae4958d3e34c6914
+homepage   : http://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.
+networking : true
+builddeps  :
+    - apache-ant
+    - openjdk-21
+rundeps    :
+    - openjfx-21
+build      : |
+    JAVA_HOME=/usr/lib64/openjdk-21 ant prepare-dist
+install    : |
+    install -dm00644 $installdir/usr/share/davmail/lib
+    install -m00644 dist/lib/* $installdir/usr/share/davmail/lib/
+
+    # Exclude (to update this list check build.xml)
+    rm -fv $installdir/usr/share/davmail/lib/{junit,winrun4j}*.jar
+
+    install -Dm00644 dist/davmail.jar $installdir/usr/share/davmail/
+    install -Dm00644 dist/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
+
+    # Systemd
+    install -Dm00644 $pkgfiles/davmail.service $installdir/usr/lib/systemd/system/davmail.service
+    install -Dm00644 $pkgfiles/davmail.tmpfiles $installdir/usr/lib/tmpfiles.d/davmail.conf
+    install -Dm00644 $pkgfiles/davmail.sysusers $installdir/usr/lib/sysusers.d/davmail.conf
+
+    # Install custom executable file with proper path of execute
+    install -Dm00755 $pkgfiles/davmail $installdir/usr/bin/davmail