diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 820836c9f348..e4e0e68e3832 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -3,3 +3,4 @@ DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d3691823
 DIST dbmail-3.3.1.tar.gz 2523029 BLAKE2B fd7bd7b6a40772c8c309b2bc9cf3cd907a8b885367fe6b1c23bdd1f4d6281b7f8878caf481171ec4ad71f2644f516100da5c6ee7dfa0d4d7139725a3181a8ef5 SHA512 d0324d79d4871cc46ce3bbc5c0d8c2f587d57f262a878f685b776d8e1b4a58a67e5a0f0cf0f48c939dc3424f8a44dd78e929ea2588ab10d0246a10b3ee5c55c5
 DIST dbmail-3.4.1.tar.gz 2531604 BLAKE2B bca7935b9a6b237cfd69afa72c895bdd393c5cd7875b856805f3534a818eecd5564c4e08c432b7f6d3a33bec0be3596169900025141596426542ad73844a4624 SHA512 bf9c55c796306008e957812c9fad6eb4e5ea35c749aafbf035d4e05f59db568f91f9857ad049f5d7b85107332764e030428203e6b67dbe82ad8a26fe6c3e0d6d
 DIST dbmail-3.5.4.tar.gz 2547614 BLAKE2B 86cdfba8533e0f26d62eeb60505b37594d7eadbfdb3305a2cb0b19a91bf211c7eaef3e02ad3d820ac685aba0868963acbd506c70fe75f2c28499b2a12a306edb SHA512 5f7f5142ad9b59c12a1ee7d0648e1a0f4227e68f03e0be8a6a1b33c2b8d12f6c18c896f2e0981b4fdd9f77b59e7454815e4ed5e98951857996de1704258eceb1
+DIST dbmail-3.5.5.tar.gz 2553083 BLAKE2B 6f4a7674283f8957eea2b3df575d35719b1e3c7a79190ee72a81afc29ecb0de422abb319aa67d3b9e6d1b569747ad740ce1f0f389dca08922a43a732ca8b8ef6 SHA512 e852b695e5dfb717ca18821855de3ec8c38017a834a4a898f0d8c659eedcd133101cf87b566d1e6dc92b69c0c78715f77b74a550e70023a57044aa4472bcb86b
diff --git a/net-mail/dbmail/dbmail-3.5.5.ebuild b/net-mail/dbmail/dbmail-3.5.5.ebuild
new file mode 100644
index 000000000000..b1e9a5b4df46
--- /dev/null
+++ b/net-mail/dbmail/dbmail-3.5.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit systemd readme.gentoo-r1
+
+DESCRIPTION="Fast and scalable sql based email services"
+HOMEPAGE="https://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:= )
+	elibc_musl? ( sys-libs/queue-standalone )
+	app-text/asciidoc
+	app-text/xmlto
+	app-crypt/mhash
+	virtual/zlib:=
+	dev-libs/gmime:3.0
+	>=dev-libs/glib-2.16
+	dev-libs/libevent:=
+	virtual/libcrypt:=
+	ssl? (
+		dev-libs/openssl:=
+	)"
+RDEPEND="${DEPEND}
+	acct-group/dbmail
+	acct-user/dbmail"
+DEPEND+=" elibc_musl? ( sys-libs/queue-standalone )"
+DOCS=( AUTHORS README.md INSTALL THANKS UPGRADING )
+
+# PATCHES=( "${FILESDIR}"/${P}-fix-incompatible-pointer-type.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/metadata.xml b/net-mail/dbmail/metadata.xml
index 7612b09605a4..3e4a7d43d5fd 100644
--- a/net-mail/dbmail/metadata.xml
+++ b/net-mail/dbmail/metadata.xml
@@ -6,6 +6,9 @@
     <name>Thomas Raschbacher</name>
   </maintainer>
   <longdescription>Dbmail is the name of a group of programs that enable the possiblilty of storing and retrieving mail messages from a database. Currently MySQL, PostgreSQL and SQLite can be used as database backends.</longdescription>
+  <upstream>
+    <remote-id type="github">dbmail/dbmail</remote-id>
+  </upstream>
   <use>
     <flag name="sieve">Enable sieve filter support</flag>
   </use>