diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 5245845..2f81dd9 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -20,9 +20,13 @@ AUX dbmail-timsieved.initd 712 BLAKE2B 7cf8719435b6b6a5c807d18b3cbd4ca937a20140a
 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
+DIST dbmail-3.2.6.tar.gz 2520233 BLAKE2B 55e818a825c4c798b89790b1faa50245dd433f5cc0268e5908bf802cda2755881b5c1d9ce581e21166d8259a2081237d6c2dd88a0f5d4df14456791e414a3bcb SHA512 1b5b1e843415100151ac46f58ece228f04e330d8816301532d6cd889736afb1b7786f4a2162361de0fa8756173848402c769aa91cceb8c1e1abb962b839fc39f
 EBUILD dbmail-3.2.3-r102.ebuild 4749 BLAKE2B a5b5f821cd256bee124d0649b910718db20b679f76fde36ff5a82e51fbc15fade8380c99ebc367a68a2ecd7c7ab1b9c43c4ea00f27d1a8f5408968ec2db16071 SHA512 aabb8ce3bd21b133cf32bd9323a5970d8c173be6d13ba013e7d99107b7370545ac6dde716f395fcdd83e185358b87a0275f30a87ae0076817038eed959baac4c
 EBUILD dbmail-3.2.4-r2.ebuild 5029 BLAKE2B a54c7b4cd5f796f49334336f518d7c38c6aff9f0e10c7ba992dbe227ab19fe826470a1eefdef551826511ae64d50dfe2e2d1e57692af65254da4affc09b456c7 SHA512 bf0b4655f8b64d1dd27e665c2f9fcff74f598069c34ee2ed0d6b00dc020bb6d07af6a85affd710f47119b632d8f127aff3f57bf153ffd8e36ab4fba86c26aa8e
 EBUILD dbmail-3.2.4.ebuild 4876 BLAKE2B dcd2aef5ad6572080af315eb5604137ec7b340f3b1b3858a0591a30ef5d95cd95569a7b68e4aeeed356464cfcbd6b37e34d0d89e790da296f7a639ec6031d5ce SHA512 50caa2e33bd1f8111df1d3c44a43093e6a776287122e70208ab6a63f4201b790cc8edf6ddd13a1b2ad1bc735b6ee40372c483e4c0c028b0d43125ad558ffad93
 EBUILD dbmail-3.2.5-r2.ebuild 2440 BLAKE2B 00c1740b96418850b8f8f71220ff06f4879df5ba0522930305e4fd087819639c4e291af1cb1a4cbc6e918ea85c36f840a40779099802ba612df8b5a4e0f674c4 SHA512 36c0abd2b88422e4497036dfbbaebcd749e605edbe31609c88fa60ee101a4c2ad7b6b1d2d40b648c0f22289fa29be3f0dd386764b6cd9acb057474fd6bcba282
 EBUILD dbmail-3.2.5.ebuild 2433 BLAKE2B 6830616ea4e99605fdc88cd30322bc5df24b3e673bd83a6189f43608586ba1643f4b1cb02eb1ddc7313832ce9c2bf1931ee4eb967ce1e7b38c1e76ddb1be0d0b SHA512 730b9793e00bf28e99eec82c14ba6e4dd28530b2382d26f4e54aacb6879fa14b55a0a237340e542f24e5e4cc7ad8738365360c5581c214af5bef43f62ebfae2a
+EBUILD dbmail-3.2.6-r1.ebuild 2440 BLAKE2B 00c1740b96418850b8f8f71220ff06f4879df5ba0522930305e4fd087819639c4e291af1cb1a4cbc6e918ea85c36f840a40779099802ba612df8b5a4e0f674c4 SHA512 36c0abd2b88422e4497036dfbbaebcd749e605edbe31609c88fa60ee101a4c2ad7b6b1d2d40b648c0f22289fa29be3f0dd386764b6cd9acb057474fd6bcba282
+EBUILD dbmail-3.2.6.ebuild 2393 BLAKE2B 157dcd4e53ba3fc54ee20b2acee586c23944e38aa59bb70362e96a5404ee84be58236357668e51e3881e0724a69349b0483d788a5fcb3ed0ed9229c3ffe66766 SHA512 d0e58dda7855d6e48e3f3a748f25075d5229eeb6b9993e2dbdad923c262a2e9ca4177bd71c464b819dddc26cb174f2dfacc3983767c66cf798ff0ebd9994e896
+MISC dbmail.diff 343 BLAKE2B e5a8c5e4a1495ca1a0f0d35053e647c23ac96f26051fce32ba7d198aa17f7eaae42281ad455c61250b01a80eb5c0bc35e4a8e3949df03b0651510e217a82815c SHA512 e7babaca19be91a6fa973806fb29ed7a414aaf2d01c4905008a900fb389d90c28a77baac8e40b7b3ec09292ea0781196d7052b9395166bc466beb25dff82fa07
 MISC metadata.xml 644 BLAKE2B 70a3c2d8665df2f44e04a95a47ba9ff39778fb386c0cd9d23fe0bf824767a432c5fd9b7a87a50635b9d6592dc72632957be5c45e6777cb77625810a38823f354 SHA512 e1be3706af1329c23f831c4b2d58e076bdd0f5f30c01a4a08fd7554be392ea1dfb5f219c6852099f9c45df17cd37a71a3c228434fddbcebfac3a6ca235128877
diff --git a/net-mail/dbmail/dbmail-3.2.6-r1.ebuild b/net-mail/dbmail/dbmail-3.2.6-r1.ebuild
new file mode 100644
index 0000000..38bbc7b
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.2.6-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd readme.gentoo-r1
+
+DESCRIPTION="Fast and scalable sql based email services"
+HOMEPAGE="https://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 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:=
+	virtual/libcrypt:=
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+RDEPEND="${DEPEND}
+	acct-group/dbmail
+	acct-user/dbmail"
+DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
+PATCHES="${FILESDIR}/dbmail-3.2.5-crypt.patch"
+
+README_GENTOO_SUFFIX=""
+
+src_prepare() {
+	sed -i -e "s:nobody:dbmail: ; s:nogroup:dbmail: ; s:/var/run:/run/dbmail:" dbmail.conf || die
+	# 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
+
+	default
+}
+
+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
+	einstalldocs
+
+	docompress -x /usr/share/doc/${PF}/sql
+	dodoc -r sql
+	dodoc -r test-scripts
+	dodoc -r contrib
+	## TODO: install other contrib stuff
+
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	# 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
+
+	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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-mail/dbmail/dbmail-3.2.6.ebuild b/net-mail/dbmail/dbmail-3.2.6.ebuild
new file mode 100644
index 0000000..f4d3ee2
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.2.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd readme.gentoo-r1
+
+DESCRIPTION="Fast and scalable sql based email services"
+HOMEPAGE="https://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 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:=
+	virtual/libcrypt:=
+	ssl? (
+		dev-libs/openssl:0=
+	)"
+RDEPEND="${DEPEND}
+	acct-group/dbmail
+	acct-user/dbmail"
+DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
+
+README_GENTOO_SUFFIX=""
+
+src_prepare() {
+	sed -i -e "s:nobody:dbmail: ; s:nogroup:dbmail: ; s:/var/run:/run/dbmail:" dbmail.conf || die
+	# 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
+
+	default
+}
+
+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
+	einstalldocs
+
+	docompress -x /usr/share/doc/${PF}/sql
+	dodoc -r sql
+	dodoc -r test-scripts
+	dodoc -r contrib
+	## TODO: install other contrib stuff
+
+	insinto /etc/dbmail
+	newins dbmail.conf dbmail.conf.dist
+
+	# 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
+
+	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
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}