diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest
new file mode 100644
index 0000000..5bf808f
--- /dev/null
+++ b/dev-libs/olm/Manifest
@@ -0,0 +1,2 @@
+DIST olm-3.2.3.tar.bz2 478365 BLAKE2B d8b5069e07958a4fe12a0aeea2ba25a7b7c319c96c980abd78f78881489e68d400594a0076ecf345561364c657eb9faf54819043ca9b51af01633d8e21edf069 SHA512 b01b5bb41d828e15520a1054cd9a479ff5d464552bc379269b9bf12fd54929d2e4cd31a46c0ea07a26ead7410e50caf80d3711912131147794d88d96947ffe59
+DIST olm-3.2.4.tar.bz2 479336 BLAKE2B 9de6b869c94a7f47b269b55526408ce6930ac5354495608038888f13efe72a6fab498c85c6ffe073a1f76391cbe4a83cfc6c65382d593bc487dafe64894ca0ed SHA512 94f661a2c9fe22f7dfefc89e488be37da2fe19dedd3ba296e09c55e63886ed82b71a30d84ecbdfa5dee820b1b6a918daefab248536c137459b8f244dc514920b
diff --git a/dev-libs/olm/metadata.xml b/dev-libs/olm/metadata.xml
new file mode 100644
index 0000000..001398b
--- /dev/null
+++ b/dev-libs/olm/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gentoo@tastytea.de</email>
+		<name>Ronny (tastytea) Gutbrod</name>
+	</maintainer>
+	<longdescription lang="en">
+		An implementation of the Double Ratchet cryptographic ratchet written in
+		C and C++11 and exposed as a C API.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://gitlab.matrix.org/matrix-org/olm/-/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-libs/olm/olm-3.2.3.ebuild b/dev-libs/olm/olm-3.2.3.ebuild
new file mode 100644
index 0000000..4247aff
--- /dev/null
+++ b/dev-libs/olm/olm-3.2.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Implementation of the olm and megolm cryptographic ratchets"
+HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm"
+SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DOLM_TESTS="$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
+}
+
+src_install() {
+	use doc && DOCS=( README.md docs/{{,meg}olm,signing}.md )
+
+	cmake_src_install
+}
diff --git a/dev-libs/olm/olm-3.2.4-r1.ebuild b/dev-libs/olm/olm-3.2.4-r1.ebuild
new file mode 100644
index 0000000..006ec1b
--- /dev/null
+++ b/dev-libs/olm/olm-3.2.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Implementation of the olm and megolm cryptographic ratchets"
+HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm"
+SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DOLM_TESTS="$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
+}
+
+src_install() {
+	use doc && DOCS=( README.md docs/{{,meg}olm,signing}.md )
+
+	cmake_src_install
+}
diff --git a/dev-libs/olm/olm-3.2.4.ebuild b/dev-libs/olm/olm-3.2.4.ebuild
new file mode 100644
index 0000000..4247aff
--- /dev/null
+++ b/dev-libs/olm/olm-3.2.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Implementation of the olm and megolm cryptographic ratchets"
+HOMEPAGE="https://gitlab.matrix.org/matrix-org/olm"
+SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DOLM_TESTS="$(usex test)"
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test
+}
+
+src_install() {
+	use doc && DOCS=( README.md docs/{{,meg}olm,signing}.md )
+
+	cmake_src_install
+}
diff --git a/gnome-extra/authenticator/metadata.xml b/gnome-extra/authenticator/metadata.xml
index d5d190b..8e26a0c 100644
--- a/gnome-extra/authenticator/metadata.xml
+++ b/gnome-extra/authenticator/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gerben Jan Dijkman</name>
 	</maintainer>
 	<upstream>
-		<doc>https://gitlab.gnome.org/World/Authenticator</doc>
 		<bugs-to>https://gitlab.gnome.org/World/Authenticator/-/issues</bugs-to>
 	</upstream>
 </pkgmetadata>