diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index b5d8e29..1f158a2 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -13,6 +13,8 @@ AUX dbmail-startup-gentoo.patch 10704 BLAKE2B f8c72aaf30254a24df0a583c419d7437f3
 AUX dbmail-timsieved.initd 716 BLAKE2B 5c5d12b5d589761af4b42646ec3b9b6323781bd3cbabdc136f4cb0332ec7bc1a6375a6fe5bc8ca12b6e75b6b2d6e037877303cad4f07bb196fa0ab12245c8d0e SHA512 04f66443573fde84d220a0d808f98295a8931990a0d7bad13c0c86bfe7b2d95c3311f7fdbc6b4068223601286c34e97cb17b0f5fbc28ca05991d0cdc13d250f5
 DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fcb01cb8100cfbd0464f1342f934c099ca52fd857e05fc82b97227155e9dcfc987d6c9b5c37e7daf21b167c9841 SHA512 29cc89830278f2ff28a4221fc81d4ff13cc371fbca7fb51d5376e9243234220b552cb4b6ec035c150e6cfa178435c4f36b9ce132fc02334bc6cdeb1a41c8ed85
 DIST dbmail-3.2.4.tar.gz 2461068 BLAKE2B 2aea108bd314f2f0f3ac5c1764683aa093f07b9642a2a25db08c8b765387ddbc2d02972ea3ede7e86de09aa7bb2d7a4c8423d2e3ab6831a5c613b93c97ee0e82 SHA512 34df0b17307e3d4bd255b4f3f9df59791379fc0b090a73af9dfb02f416747051cbc7a34039384906ab30d6208efbe9c470de9c950d3ace6129292ec8c8fb1786
+DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
 EBUILD dbmail-3.2.3-r102.ebuild 4749 BLAKE2B a5b5f821cd256bee124d0649b910718db20b679f76fde36ff5a82e51fbc15fade8380c99ebc367a68a2ecd7c7ab1b9c43c4ea00f27d1a8f5408968ec2db16071 SHA512 aabb8ce3bd21b133cf32bd9323a5970d8c173be6d13ba013e7d99107b7370545ac6dde716f395fcdd83e185358b87a0275f30a87ae0076817038eed959baac4c
 EBUILD dbmail-3.2.4.ebuild 4876 BLAKE2B dcd2aef5ad6572080af315eb5604137ec7b340f3b1b3858a0591a30ef5d95cd95569a7b68e4aeeed356464cfcbd6b37e34d0d89e790da296f7a639ec6031d5ce SHA512 50caa2e33bd1f8111df1d3c44a43093e6a776287122e70208ab6a63f4201b790cc8edf6ddd13a1b2ad1bc735b6ee40372c483e4c0c028b0d43125ad558ffad93
+EBUILD dbmail-3.2.5.ebuild 4826 BLAKE2B 2c742713787ec6db3f470a25dd82eb16b9e1688df3db01305f80f9b6bbb6beac2dc44cc1f8ef3e4e064d02a15f8e4483ad4df1ee455fe21cb5a2e63169f472e2 SHA512 896dfcf09ce57e741bf80b4b6512f456a513c769451457c0818a0a18a7878960dcdd2e67aba39c147af747e1d3a352d3d2b27e56ff055894ce70282563189e8f
 MISC metadata.xml 644 BLAKE2B 70a3c2d8665df2f44e04a95a47ba9ff39778fb386c0cd9d23fe0bf824767a432c5fd9b7a87a50635b9d6592dc72632957be5c45e6777cb77625810a38823f354 SHA512 e1be3706af1329c23f831c4b2d58e076bdd0f5f30c01a4a08fd7554be392ea1dfb5f219c6852099f9c45df17cd37a71a3c228434fddbcebfac3a6ca235128877
diff --git a/net-mail/dbmail/dbmail-3.2.5.ebuild b/net-mail/dbmail/dbmail-3.2.5.ebuild
new file mode 100644
index 0000000..1368fda
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.2.5.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="Fast and scalable sql based email services"
+HOMEPAGE="http://www.dbmail.org/"
+SRC_URI="https://github.com/dbmail/dbmail/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+doc jemalloc ldap libressl sieve ssl static systemd"
+
+DEPEND="dev-db/libzdb
+	sieve? ( >=mail-filter/libsieve-2.2.1 )
+	ldap? ( >=net-nds/openldap-2.3.33 )
+	jemalloc? ( dev-libs/jemalloc )
+	app-text/asciidoc
+	app-text/xmlto
+	app-crypt/mhash
+	sys-libs/zlib
+	dev-libs/gmime:2.6
+	>=dev-libs/glib-2.16
+	dev-libs/libevent
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="${DEPEND}
+	acct-group/dbmail
+	acct-user/dbmail"
+
+src_configure() {
+	econf \
+		--enable-manpages \
+		--sysconfdir=/etc/dbmail \
+		$(use_enable doc manpages) \
+		$(use_enable static) \
+		$(use_enable systemd) \
+		$(use_with jemalloc) \
+		$(use_with sieve) \
+		$(use_with ldap auth-ldap)
+}
+
+src_install() {
+	emake DESTDIR="${D}" SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+
+	DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
+	einstalldocs
+
+	docompress -x /usr/share/doc/${PF}/sql
+	dodoc -r sql
+	dodoc -r test-scripts
+	dodoc -r contrib
+	## TODO: install other contrib stuff
+
+	sed -i -e "s:nobody:dbmail:" dbmail.conf || die
+	sed -i -e "s:nogroup:dbmail:" dbmail.conf || die
+	sed -i -e "s:/var/run:/run/dbmail:" dbmail.conf || die
+
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	# change config path to our default and use the conf.d and init.d files from the contrib dir
+	sed -i -e "s:/etc/dbmail.conf:/etc/dbmail/dbmail.conf:" contrib/startup-scripts/gentoo/init.d-dbmail || die
+	#sed -i -e "s:exit 0:return 1:" contrib/startup-scripts/gentoo/init.d-dbmail || die
+	#sed -i -e "s:/var/run:/var/run/dbmail:" contrib/startup-scripts/gentoo/init.d-dbmail || die
+	#newconfd contrib/startup-scripts/gentoo/conf.d-dbmail dbmail
+	#newinitd contrib/startup-scripts/gentoo/init.d-dbmail dbmail
+	# use custom init scripts until updated in upstream contrib
+	newinitd "${FILESDIR}/dbmail-imapd.initd" dbmail-imapd
+	newinitd "${FILESDIR}/dbmail-lmtpd.initd" dbmail-lmtpd
+	newinitd "${FILESDIR}/dbmail-pop3d.initd" dbmail-pop3d
+	newinitd "${FILESDIR}/dbmail-timsieved.initd" dbmail-timsieved
+	sed -i -e "s:/var/run:/run:" "${D}"/etc/init.d/dbmail-* || die
+
+	dobin contrib/mailbox2dbmail/mailbox2dbmail
+	doman contrib/mailbox2dbmail/mailbox2dbmail.1
+
+	# ldap schema
+	if use ldap; then
+		insinto /etc/openldap/schema
+		doins "${S}/dbmail.schema"
+	fi
+
+	keepdir /var/lib/dbmail
+	fperms 750 /var/lib/dbmail
+	fowners dbmail:dbmail /var/lib/dbmail
+	# create this through init-scripts instead of at install time (bug #455002)
+	#keepdir /run/dbmail
+	#fowners dbmail:dbmail /run/dbmail
+}
+
+pkg_postinst() {
+	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
+	elog "for remaining instructions on setting up dbmail users and "
+	elog "for finishing configuration to connect to your MTA and "
+	elog "to connect to your db."
+	echo
+	elog "DBMail requires either SQLite, PostgreSQL or MySQL."
+	elog "Database schemes can be found in /usr/share/doc/${PF}/"
+	elog "You will also want to follow the installation instructions"
+	elog "on setting up the maintenance program to delete old messages."
+	elog "Don't forget to edit /etc/dbmail/dbmail.conf as well."
+	echo
+	elog "For regular maintenance, add this to crontab:"
+	elog "0 3 * * * /usr/bin/dbmail-util -cpdy >/dev/null 2>&1"
+	echo
+	elog "Please make sure to run etc-update."
+	elog "If you get an error message about plugins not found"
+	elog "please add the library_directory configuration switch to"
+	elog "dbmail.conf and set it to the correct path"
+	elog "(usually /usr/lib/dbmail or /usr/lib64/dbmail on amd64)"
+	elog "A sample can be found in dbmail.conf.dist after etc-update."
+	echo
+	elog "We are now using the init script from upstream."
+	elog "Please edit /etc/conf.d/dbmail to set which services to start"
+	elog "and delete /etc/init.d/dbmail-* when you are done. (don't"
+	elog "forget to rc-update del dbmail-* first)"
+	echo
+	elog "Changed pid directory to /run/dbmail (see"
+	elog "http://www.dbmail.org/mantis/view.php?id=949 for details)"
+	echo
+	ewarn "The database config has changed to support libzdb db URI"
+	ewarn "Please check the documentation (or Bug #479664)"
+	echo
+	ewarn "The database schema has changed since 3.0.x make sure"
+	ewarn "to run the migration script"
+	echo
+	ewarn "Please be aware, that the single init-script for all services"
+	ewarn "has been replaced with seperate init scripts for the individual services."
+	ewarn "Make sure to add dbmail-(imapd|lmtpd|pop3d|timsieved) using rc-update"
+	ewarn "and remove dbmail if you want to take advantage of this change."
+	echo
+}