diff --git a/net-im/biboumi/Manifest b/net-im/biboumi/Manifest
index ad0737ce7..7e413a2d2 100644
--- a/net-im/biboumi/Manifest
+++ b/net-im/biboumi/Manifest
@@ -3,12 +3,13 @@ Hash: SHA512
 
 AUX biboumi.initd 507 BLAKE2B c53fc05b0b1cee3632953742303cfd77238929866afcf371ceca761623a6d3536b57f973b57d6a7267e9bac061067e8ab499c65100a9c82df2e4a983eec93821 SHA512 8e82ff168233a602c2ea585ab6b5ada8f2e698360e2ac99a4b38506e04d4423e495e371afa38a3e5da54b8686765b8d1ce6b85f709f4af769e3dab8318774904
 DIST biboumi-8.4.tar.xz 142576 BLAKE2B 3be5f8caf406c480a2750d76eacfe9191bccd8bd0fc2ba0ffe6352bf6f6527ab60f16eb25c9820c063af6c9ff4f1b125eb8d51d53bae4392a0d276e7ad488087 SHA512 69f7a47aaf2729a6bffb047201305cef4b87da952aa103d82e715585bf7b2e97fca8159ced1d74c4b01508c874c0db274d7b8349d1579ee3e69fc0ced2c260c2
+EBUILD biboumi-8.4-r1.ebuild 1986 BLAKE2B 4b8005b0d0df5039f7b6fa6414deee86e0b860b2d5da60e8690f64cb8d823ef8a3e5256308ce9def08bc510883560918796fa012fda93a3a659dbec73d323c55 SHA512 f3453d6a2b097c3058c4dd15064d4a6d8f1c5813ddfa12a9059d2d1770733cf802ff4536377c535e7ca79f5e01d346ffde55dfe17222e8121623118231617c2e
 EBUILD biboumi-8.4.ebuild 1886 BLAKE2B 4bf8ada430b961730374ccb02ca269574e350b75b7086f60d0dc6541225aef61489dd08b29f049e136a21d4cbcc077198afd77accba2a008af866f0f66296053 SHA512 de64d7728495725a3dce317dbf254085e2c7072a9f90070ddd22dcf75d07f61727473f61c9b88e01a9b01ab54c7239454269db4d27c390d42402cf8568798323
 MISC metadata.xml 475 BLAKE2B 05f87ecb78acaf504d1036c8fe0203325610cd6ef8e0a3d81eaef0fb337c321b80827fdf5e1c02551f3423d438796c4aa7f25fea64e98e6bceaf74c8a35bef97 SHA512 0b6591a9793ed4965f18e1dd3bd630d30ce6d8c8ecf00638aeebce098bfda169fbd21db161f2871f7e022c7e35845a71f8167d94b9c7d480fc7c046b2db41d75
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXpMVTgAKCRDPw5SX8bJu
-B9vXAPsF3Vot7x33mViZnJ7ctQ7F7OO/vdbbMS3XAht4lXtskAD9E8aLQ6MhM7fg
-r7bitjU9kVF3frjiCZ+PGztKmI1RW8A=
-=dcWr
+iHQEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXpNfrgAKCRDPw5SX8bJu
+B0dtAPitojtKdlXGk0uAJ5cm39mDen+fPx9NPjGlM9boscy7AP9ZsbqQ8vJynSAQ
+VQM7ajaSH8bHcD7mD8LNjoBDvtB7Jg==
+=A4pA
 -----END PGP SIGNATURE-----
diff --git a/net-im/biboumi/biboumi-8.4-r1.ebuild b/net-im/biboumi/biboumi-8.4-r1.ebuild
new file mode 100644
index 000000000..aedf9e0e1
--- /dev/null
+++ b/net-im/biboumi/biboumi-8.4-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="XMPP gateway to IRC"
+HOMEPAGE="https://biboumi.louiz.org/"
+SRC_URI="https://git.louiz.org/biboumi/snapshot/biboumi-${PV}.tar.xz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +idn postgres +sqlite ssl systemd udns"
+
+RDEPEND="
+	acct-user/biboumi
+	dev-libs/expat
+	virtual/libiconv
+	sys-apps/util-linux
+	sqlite? ( dev-db/sqlite )
+	postgres? ( dev-db/postgresql:* )
+	idn? ( net-dns/libidn )
+	udns? ( net-libs/udns )
+	ssl? ( dev-libs/botan:2 )
+	!ssl? ( dev-libs/libgcrypt )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-text/pandoc"
+
+DOCS=( README.rst CHANGELOG.rst )
+
+# Allow biboumi to run an identd on port 113.
+FILECAPS=( cap_net_bind_service+ep usr/bin/biboumi )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use systemd; then		# Don't install biboumi.service.
+	   sed -i '/DESTINATION lib\/systemd\/system/d' CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_BOTAN="$(usex ssl)"
+		-DWITH_LIBIDN="$(usex idn)"
+		-DWITH_SYSTEMD="$(usex systemd)"
+		-DWITH_UDNS="$(usex udns)"
+		-DWITH_SQLITE3="$(usex sqlite)"
+		-DWITH_POSTGRESQL="$(usex postgres)"
+
+		-DWITHOUT_SYSTEMD="$(usex systemd no yes)"
+		-DWITHOUT_UDNS="$(usex udns no yes)"
+		-DWITHOUT_POSTGRESQL="$(usex postgres no yes)"
+	)							# The WITHOUT_* is really needed.
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# The man page is not generated by the build system.
+	mkdir "${S}/man" || die
+	pandoc --standalone --to=man "doc/biboumi.1.rst" \
+		   --output="${S}/man/biboumi.1" || die
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	newinitd "${FILESDIR}/${PN}".initd "${PN}"
+
+	diropts --owner=biboumi --group=biboumi --mode=750
+	if use sqlite; then
+		keepdir /var/lib/biboumi
+	fi
+	keepdir /var/log/biboumi
+
+	insinto /etc/biboumi
+	insopts --group=biboumi --mode=640
+	doins conf/biboumi.cfg || die
+}