diff --git a/net-im/biboumi/Manifest b/net-im/biboumi/Manifest
index 529a3bd..b03d9a6 100644
--- a/net-im/biboumi/Manifest
+++ b/net-im/biboumi/Manifest
@@ -2,13 +2,15 @@
 Hash: SHA512
 
 AUX biboumi.initd 507 BLAKE2B c53fc05b0b1cee3632953742303cfd77238929866afcf371ceca761623a6d3536b57f973b57d6a7267e9bac061067e8ab499c65100a9c82df2e4a983eec93821 SHA512 8e82ff168233a602c2ea585ab6b5ada8f2e698360e2ac99a4b38506e04d4423e495e371afa38a3e5da54b8686765b8d1ce6b85f709f4af769e3dab8318774904
+AUX biboumi.logrotate 134 BLAKE2B adffee810ac3a35423c98e3560aad3ef7a79ddeb4682ee966e4e3af013b9cdaa5f95d8e6b1434a93268e76345dadea4f8e90f940770aa2ad51cae26036475c64 SHA512 b4569cbaabd467d7761e39573d67bfb5032fb31e5a1e5e4a6dc6daa567e7bb73d509a91ab627c11473b5027aa077ae7e8f466d56a6d71c4c6080660c62e78ce2
 DIST biboumi-8.4.tar.xz 142576 BLAKE2B 3be5f8caf406c480a2750d76eacfe9191bccd8bd0fc2ba0ffe6352bf6f6527ab60f16eb25c9820c063af6c9ff4f1b125eb8d51d53bae4392a0d276e7ad488087 SHA512 69f7a47aaf2729a6bffb047201305cef4b87da952aa103d82e715585bf7b2e97fca8159ced1d74c4b01508c874c0db274d7b8349d1579ee3e69fc0ced2c260c2
 EBUILD biboumi-8.4-r1.ebuild 1953 BLAKE2B 31edc18d9f487b46087dbb322440fb08c427372cda3065dafd101f76fb5744603480a664a727f685bf44a82043144fd4ad26c0669ba2aeb00e690dd3f4b31836 SHA512 f62c5677deaa31383919a61fa6b5b67d28f1ff954d6215e5c52d2e0824459fe7342e1412fcb67b4ccaa3f135d87561e65c92b5018caf1daca1cd9fbc0c800847
-MISC metadata.xml 475 BLAKE2B 05f87ecb78acaf504d1036c8fe0203325610cd6ef8e0a3d81eaef0fb337c321b80827fdf5e1c02551f3423d438796c4aa7f25fea64e98e6bceaf74c8a35bef97 SHA512 0b6591a9793ed4965f18e1dd3bd630d30ce6d8c8ecf00638aeebce098bfda169fbd21db161f2871f7e022c7e35845a71f8167d94b9c7d480fc7c046b2db41d75
+EBUILD biboumi-8.4-r2.ebuild 2073 BLAKE2B 8550c0108b919e9b0df41e0978caeff57cc1dcfd767e624d292911457e42993f8c70f2ffe3417f65e175cc09e2694dbc77c64e9a96c64f75054fe40ce4c4c7a4 SHA512 f498499df29d7c15745cf115c2fd42107d2bca3d1ecd239f69e479060e9158aebf1e7504052e7e8b95e6c4fd8a07fcc8f867c4d515de77ea76d9a2bde711fd96
+MISC metadata.xml 549 BLAKE2B 8d553447fb5d4646bafc0d718b2f0ca8102a99cc2e76de88d656ceeb19ad01ab362538bd63aa81cc84f9efea8008872691ab99d4b3d64664a0c06ac36bac4e82 SHA512 695b1b943b615653121c574a5e4c31fabfa43980fb2c82d7df7829e2cfaa0018efc30a797377ace5fcb566c917b4c434786644c5c4b3f43a7e20da0bc64920f9
 -----BEGIN PGP SIGNATURE-----
 
-iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXpOzUQAKCRDPw5SX8bJu
-B7SvAP9dz/7v5jTZ3Rl5IP5+htzxrqecE+AnyfmrJ1y0x3qknAEAhRuIBkKQIw4d
-eOdpnq3gFOGh5VONiZ5lPDYqh1KcaDg=
-=P7Uc
+iHUEAREKAB0WIQQ1VSZoZMptf/RapufPw5SX8bJuBwUCXpO3pgAKCRDPw5SX8bJu
+B0LKAP0fNxQP0H+ObbigvxN1KKc8Lkpr+8/gx3DciCkC+c3p0gD+M6q/dCk0r0aq
+rlN7uYUwnF8UeCHhYvhqHlnGfZ5Hpn4=
+=CN2G
 -----END PGP SIGNATURE-----
diff --git a/net-im/biboumi/biboumi-8.4-r2.ebuild b/net-im/biboumi/biboumi-8.4-r2.ebuild
new file mode 100644
index 0000000..58bda1b
--- /dev/null
+++ b/net-im/biboumi/biboumi-8.4-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+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="+idn logrotate 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_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_src_configure
+}
+
+src_compile() {
+	cmake_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_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
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/${PN}.logrotate" "${PN}" || die
+	fi
+}
diff --git a/net-im/biboumi/files/biboumi.logrotate b/net-im/biboumi/files/biboumi.logrotate
new file mode 100644
index 0000000..fa7d438
--- /dev/null
+++ b/net-im/biboumi/files/biboumi.logrotate
@@ -0,0 +1,8 @@
+/var/log/biboumi/biboumi.log {
+	sharedscripts
+	missingok
+	notifempty
+	postrotate
+		rc-service biboumi reload > /dev/null
+	endscript
+}
diff --git a/net-im/biboumi/metadata.xml b/net-im/biboumi/metadata.xml
index 4c21842..a4bf9d5 100644
--- a/net-im/biboumi/metadata.xml
+++ b/net-im/biboumi/metadata.xml
@@ -12,5 +12,6 @@
 	<use>
 		<flag name="udns">Asynchronously resolve domain names using
 		net-libs/udns</flag>
+		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
 	</use>
 </pkgmetadata>