diff --git a/dev-libs/olm/Manifest b/dev-libs/olm/Manifest
index 494e2bfffd..e5ecd0ae1b 100644
--- a/dev-libs/olm/Manifest
+++ b/dev-libs/olm/Manifest
@@ -1,3 +1 @@
-DIST olm-3.2.11.tar.bz2 2735303 BLAKE2B 577465d5a5246cda85848e0caa2912bd225af520c23a247cacec06669bae2ab0b7c3bf209a203e8bf2f7e0e573f7f30f8699704a2b6cf2e7996209eade69bb8c SHA512 4ab2263395efd33ecb336577d72845c8eaf6f6478448d78f104424ea7f48f6273e13df4038f96a05e946dbe5f6beb952bbbc86b81eaca035195dbdaaf9a2dd26
-DIST olm-3.2.8.tar.bz2 489350 BLAKE2B bf8b31262c15da2cffd5eeb1f426fe60e83dc60b3377191d65b4b4992133f92adfb7d18deb69b075207550b1b32220a1d807f331e58b41839d8aa5330a80bf3d SHA512 2a249b6880ff0c368458c14d6bae3103890f23dceaaf5753d140884185590fd54f1d7bcb8959f43b3b0f5c9302f76e380e6cdfe3340feab7f9fff60362a39303
-DIST olm-3.2.9.tar.bz2 2734794 BLAKE2B 6c5cc89804071f961ebd571dd5d3fac43aa9517fda4e029a0855fc89f4ec46e49b784aa2cfbf8cec8e34b8ef06c5e61f2111ec30fc872f44c90795359892f205 SHA512 c196430054920d78587fc79eed25312d11498594257b9a12057bfb2feaf2abfb7df35854952b4a36bc22a8c62b99b58e55f9434001a00791ca62ca47556957a5
+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
index 15a33f236d..632c7f8cdf 100644
--- a/dev-libs/olm/metadata.xml
+++ b/dev-libs/olm/metadata.xml
@@ -1,15 +1,11 @@
 <?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://github.com/matrix-org/olm/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
+  <maintainer type="person">
+    <email>mva@gentoo.org</email>
+    <description>Also, you can find me on IRC (FreeNode) as mva, or in Telegram as @mva_name</description>
+    <name>Vadim A. Misbakh-Soloviov</name>
+  </maintainer>
+  <longdescription>Long description of the package</longdescription>
+  <use/>
+</pkgmetadata>
\ No newline at end of file
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 0000000000..be64dfcbc3
--- /dev/null
+++ b/dev-libs/olm/olm-3.2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
+HOMEPAGE="https://git.matrix.org/git/olm/about/"
+
+inherit cmake-multilib
+
+if [[ ${PV} != "9999" ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.matrix.org/matrix-org/${PN}.git"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-libs/olm/olm-9999.ebuild b/dev-libs/olm/olm-9999.ebuild
new file mode 100644
index 0000000000..4ebd7c9e50
--- /dev/null
+++ b/dev-libs/olm/olm-9999.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
+HOMEPAGE="https://git.matrix.org/git/olm/about/"
+
+inherit cmake-multilib
+
+if [[ ${PV} != "9999" ]]; then
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
+else
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.matrix.org/matrix-org/${PN}.git"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"