diff --git a/net-mail/davmail/Manifest b/net-mail/davmail/Manifest
new file mode 100644
index 0000000..622162a
--- /dev/null
+++ b/net-mail/davmail/Manifest
@@ -0,0 +1,6 @@
+AUX davmail.conf 99 BLAKE2B 7fbfaefb563de903652f5eceda72bc9d3503711cea98f9f84d63d4fdf30815548d05b40559e812b96c48b1b4a7ed5435f64cab69bff833b5a04d0f268df8f777 SHA512 fc99a9e54d738a679b946e3c17663ef2c7974eba43011e8bdc980654a2f3a216005cd67328f650f35577b8d00ea2dd0ad393604407b9dec81362371ea4b3cdc1
+AUX davmail.init 612 BLAKE2B 86fa7c7291184344e2883511887c9791390be6571cdf7e3174a938b70e9214f842b031278789b4aace401ca0362d2c9d86a616aa386debc100ec018499e8d756 SHA512 0739f05ee91c6815b1b16f1233733ed6e1382e73a28a0dbdcda638eb6f69a9bc398cf9bad7d6abfda222e96be7cff6a82ea134ab777903e9b67776fb05233959
+AUX davmail.png 4218 BLAKE2B 590ac8db85b1a4e9bb5c06d773349684a8ebabaeb584001d14a3fa92de09ccd9d5ea82b44c418c785f3b462d17e17ef060d2ed610e2c20c4207c5a534c49276a SHA512 da600b141df1144c17ae0362f20ff06019986aa73cabeae088da2ae8c917f2e043b127799abc7587011358bcc366fbd2257115e64e02fc0669aefdd05c6581be
+AUX davmail.properties 1290 BLAKE2B 8be15234a50650a2082b3cedd003427c217dea63f2804e44da3470c3db740f4fcf0279cdb99a6b619484067721a9b28c9fcff56509e17fbdd768689cfcfa0a61 SHA512 af7403a99a5014b35163801a818c141ab7d0427f660900e15e16724ab1d05b4f346389584ff4537692d9f48f31a191a77f4b55d2960e694cfc00f2d00ba8ded6
+DIST davmail-5.4.0.tar.gz 21033986 BLAKE2B e8e1b2fbb0507243d944133241a8707f142e29ed579193bd489c85eeedcf79f50f7a3e321703b60ff85d9502aba82614b708cebc5a28602f12ffb6ff2a486229 SHA512 19bf58630b4948b5f21a0cd440c0e7e4ef351d6500205c172accbbc531d7b2f5c1c1c86bbf8ecf7ee7aad9e559bcea5be37bb6f862ea39c0c09116531ffceff2
+EBUILD davmail-5.4.0.ebuild 3546 BLAKE2B 482af25d59927d8eae94d57f5995c1220db816352480b753b7f253715ea4dcdb96eb3301179838ad41735daf0917864bc9d7616105146c373f6abe337eeed8f1 SHA512 ac7a12b02f29b7e37e2facd13d8b58b750f4ecdf53a1716b69a5f60049743f7b60b5fb82908f3400aba3fd8ba1e3174de0d845403ce01f95effb67667fc9c2e1
diff --git a/net-mail/davmail/davmail-5.4.0.ebuild b/net-mail/davmail/davmail-5.4.0.ebuild
new file mode 100644
index 0000000..bb7fe9c
--- /dev/null
+++ b/net-mail/davmail/davmail-5.4.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+
+#based on the old davmail-bin ebuild 
+
+EAPI=6
+
+EANT_BUILD_TARGET="dist"
+EANT_NEEDS_TOOLS="true"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+inherit eutils java-pkg-2 java-ant-2 user
+
+DESCRIPTION="DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange and Office 365 Gateway"
+HOMEPAGE="http://davmail.sourceforge.net/"
+SRC_URI="https://github.com/mguessan/davmail/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="server"
+KEYWORDS="~amd64 ~x86"
+
+EANT_GENTOO_CLASSPATH=""
+
+#todo: make packages for all of them....
+EANT_GENTOO_CLASSPATH_EXTRA=":dist/lib/woodstox-core.jar:dist/lib/commons-collections.jar:dist/lib/log4j.jar:dist/lib/javax.mail.jar:dist/lib/commons-logging:dist/lib/stax2-api.jar:dist/lib/jettison.jar:dist/lib/jdom.jar:dist/lib/slf4j-log4j12.jar:dist/lib/httpcore.jar:dist/lib/davmail.jar:dist/lib/libgrowl.jar:dist/lib/jackrabbit-webdav.jar:dist/lib/slf4j-api.jar:dist/lib/jcharset.jar:dist/lib/jcifs.jar:dist/lib/sonarqube-ant-task.jar:dist/lib/httpclient.jar:dist/lib/winrun4j.jar:dist/lib/commons-httpclient.jar:dist/lib/activation.jar:dist/lib/htmlcleaner.jar:dist/lib/commons-codec.jar:dist/lib/junit.jar:dist/lib/swt.jar:dist/lib/stax-api.jar"
+
+COMMON_DEPS="" #=dev-java/commons-httpclient-3.1"
+DEPEND="
+        >=virtual/jdk-1.8
+        ${COMMON_DEPS}"
+RDEPEND="
+        >=virtual/jre-1.8
+        ${COMMON_DEPS}"
+        
+EANT_DOC_TARGET="doc"
+
+pkg_setup() {
+	if use server ; then
+		enewuser davmail -1 -1 /dev/null
+	fi
+}
+
+src_prepare() {
+        ewarn "Dependencies are bundled and installed with this ebuild. Ant takes care of them. This should be fixed."
+        java-pkg-2_src_prepare
+}
+
+src_install() {
+        
+
+        for JAR in $( find "${S}"/dist/lib/ -type f -name \*.jar ); do
+             java-pkg_newjar "${JAR}" $(basename "${JAR}" | sed 's/-[0-9].*//')".jar" #strip version from dependencies filename. This is what the gentoo dev manual recommands if I understood correctly. This is also useful for EANT_GENTOO_CLASSPATH_EXTRA, because I don't have to update it after a dependency version bump.
+        done 
+        
+         java-pkg_dojar dist/davmail.jar 
+
+        
+         java-pkg_dolauncher davmail --jar davmail.jar --main davmail.DavGateway
+         
+         doicon "${FILESDIR}"/${PN}.png
+         
+         make_desktop_entry ${PN} "DavMail" /usr/share/pixmaps/${PN}.png "Network"
+         
+         if use server ; then
+            # log file
+            touch ${PN}.log
+            insinto /var/log
+            doins ${PN}.log
+            fowners ${PN} /var/log/${PN}.log
+
+            # config files
+            insinto /etc
+            doins "${FILESDIR}"/${PN}.properties
+            newinitd "${FILESDIR}"/${PN}.init ${PN}
+            newconfd "${FILESDIR}"/${PN}.conf ${PN}
+	    fi
+         #java-pkg_register-dependency "${ED}/usr/share/${PN}"/*.jar
+         #java-pkg_regjar "${ED}/usr/share/${PN}"/*.jar ${D}
+ #       java-pkg_dolauncher GenomeAnalysisTK --jar GenomeAnalysisTK.jar
+#        java-pkg_dolauncher AnalyzeCovariates --jar AnalyzeCovariates.jar
+}
+
+
+pkg_postinst() {
+	if use server ; then
+		elog
+		elog "You have chosen to run ${PN} as a system service. You will need to"
+		elog "modify /etc/${PN}.properties to serve your needs."
+		elog
+		elog "You may find it easier to run the ${PN}, configure it via the GUI"
+		elog "and copy the resulting ~/.${PN}.properties to /etc. Make sure you"
+		elog "set ${PN}.server=true and ${PN}.allowRemote=true."
+		elog
+	fi
+}
diff --git a/net-mail/davmail/files/davmail.conf b/net-mail/davmail/files/davmail.conf
new file mode 100644
index 0000000..f183b09
--- /dev/null
+++ b/net-mail/davmail/files/davmail.conf
@@ -0,0 +1,3 @@
+# /etc/conf.d/davmail: config file for /etc/init.d/davmail
+
+DAVMAIL_CONF="/etc/davmail.properties"
diff --git a/net-mail/davmail/files/davmail.init b/net-mail/davmail/files/davmail.init
new file mode 100644
index 0000000..139367d
--- /dev/null
+++ b/net-mail/davmail/files/davmail.init
@@ -0,0 +1,33 @@
+#!/sbin/openrc-run
+
+PN="davmail"
+USER="${PN}"
+PID_FILE="/var/run/${PN}.pid"
+RUN_FILE="/usr/bin/${PN}"
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ ! -e ${DAVMAIL_CONF} ]; then
+		eerror "You need to have a valid configuration file at ${DAVMAIL_CONF}"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting DavMail gateway"
+
+	start-stop-daemon --start --user ${USER} \
+	--pidfile ${PID_FILE} --make-pidfile --background \
+	--exec ${RUN_FILE} -- ${DAVMAIL_CONF}
+	eend $?
+}
+
+stop() {
+	ebegin "Shutting down DavMail gateway"
+	start-stop-daemon --stop --user ${USER} --pidfile ${PID_FILE}
+	eend $?
+}
diff --git a/net-mail/davmail/files/davmail.png b/net-mail/davmail/files/davmail.png
new file mode 100644
index 0000000..d262a95
Binary files /dev/null and b/net-mail/davmail/files/davmail.png differ
diff --git a/net-mail/davmail/files/davmail.properties b/net-mail/davmail/files/davmail.properties
new file mode 100644
index 0000000..0f946a8
--- /dev/null
+++ b/net-mail/davmail/files/davmail.properties
@@ -0,0 +1,48 @@
+#DavMail settings
+davmail.allowRemote=true
+davmail.bindAddress=
+davmail.caldavAlarmSound=
+davmail.caldavEditNotifications=false
+davmail.caldavPastDelay=90
+davmail.caldavPort=1080
+davmail.defaultDomain=
+davmail.disableUpdateCheck=true
+davmail.enableEws=false
+davmail.enableProxy=false
+davmail.forceActiveSyncUpdate=false
+davmail.imapAutoExpunge=true
+davmail.imapIdleDelay=
+davmail.imapPort=1143
+davmail.keepDelay=30
+davmail.ldapPort=1389
+davmail.logFilePath=/var/log/davmail.log
+davmail.popPort=1110
+davmail.proxyHost=
+davmail.proxyPassword=
+davmail.proxyPort=
+davmail.proxyUser=
+davmail.sentKeepDelay=90
+davmail.server=true
+davmail.server.certificate.hash=
+davmail.showStartupBanner=false
+davmail.smtpPort=1025
+davmail.ssl.clientKeystoreFile=
+davmail.ssl.clientKeystorePass=
+davmail.ssl.clientKeystoreType=
+davmail.ssl.keyPass=
+davmail.ssl.keystoreFile=
+davmail.ssl.keystorePass=
+davmail.ssl.keystoreType=
+davmail.ssl.nosecurecaldav=false
+davmail.ssl.nosecureimap=false
+davmail.ssl.nosecureldap=false
+davmail.ssl.nosecurepop=false
+davmail.ssl.nosecuresmtp=false
+davmail.ssl.pkcs11Config=
+davmail.ssl.pkcs11Library=
+davmail.url=
+davmail.useSystemProxies=false
+log4j.logger.davmail=DEBUG
+log4j.logger.httpclient.wire=WARN
+log4j.logger.org.apache.commons.httpclient=WARN
+log4j.rootLogger=WARN