diff --git a/dev-python/python-axolotl-curve25519/Manifest b/dev-python/python-axolotl-curve25519/Manifest
new file mode 100644
index 0000000..7ec7742
--- /dev/null
+++ b/dev-python/python-axolotl-curve25519/Manifest
@@ -0,0 +1 @@
+DIST python-axolotl-curve25519-0.1.tar.gz 71461 SHA256 c559f6a5bf51e869325b36bd83c14cccd7dec1c6e7599e797f9ba27a72d339c0 SHA512 e8dc93e6830502706966eb7b9adc7daf67fc95bd246661eed58aedef5b964f92abe20362bc56b7ad9d97ab322a4c97b056174a9b63fddd0ecd4eaeaf7b2473bd WHIRLPOOL cbf794e578c4c5dabe62829da4502eff1e30e3dc6a4e6b8e2943eeadce18a9eef603f69ead0da06d290d8da744fe2b1232c76cd67e1fcc0fd819bf01cb1d2741
diff --git a/dev-python/python-axolotl-curve25519/metadata.xml b/dev-python/python-axolotl-curve25519/metadata.xml
new file mode 100644
index 0000000..97767f6
--- /dev/null
+++ b/dev-python/python-axolotl-curve25519/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>tk-gentoo@meskal.net</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.1.ebuild b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.1.ebuild
new file mode 100644
index 0000000..5671842
--- /dev/null
+++ b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7)
+
+inherit distutils-r1
+
+DESCRIPTION="python implementation of axolotl-curve25519 encryption"
+HOMEPAGE="https://github.com/tgalal/python-axolotl-curve25519"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-9999.ebuild b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-9999.ebuild
new file mode 100644
index 0000000..2e38c05
--- /dev/null
+++ b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-9999.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7)
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="python implementation of axolotl-curve25519 encryption"
+HOMEPAGE="https://github.com/tgalal/python-axolotl-curve25519"
+EGIT_REPO_URI="https://github.com/tgalal/python-axolotl-curve25519.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
new file mode 100644
index 0000000..df5c2e7
--- /dev/null
+++ b/dev-python/python-axolotl/Manifest
@@ -0,0 +1 @@
+DIST v0.1.6.tar.gz 51984 SHA256 beb30d52ee2c2895f6ba7ab025da88689e25d5a6514072fb745d66ab2d69e37c SHA512 bad79fc3fd85a52344969986f4e1045a98604f062af3bead39c6ca16b5c3b39ecb59b19e7fe31d8c321186d14189418d7a91369d5a81e9aa4dceb5b97ad93e9f WHIRLPOOL 7b809f023b923ae522b32175051fbbc95f540bfd2f697900933dd92297442c3d749fecd8abf72a1627b1918c00fe9e0f1c62025f8ef580366e555b6085ac8e41
diff --git a/dev-python/python-axolotl/metadata.xml b/dev-python/python-axolotl/metadata.xml
new file mode 100644
index 0000000..97767f6
--- /dev/null
+++ b/dev-python/python-axolotl/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>tk-gentoo@meskal.net</email>
+</maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-axolotl/python-axolotl-0.1.6.ebuild b/dev-python/python-axolotl/python-axolotl-0.1.6.ebuild
new file mode 100644
index 0000000..8ac622b
--- /dev/null
+++ b/dev-python/python-axolotl/python-axolotl-0.1.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7)
+
+inherit distutils-r1
+
+DESCRIPTION="python implementation of axolotl encryption"
+HOMEPAGE="https://github.com/tgalal/python-axolotl"
+SRC_URI="https://github.com/tgalal/${PN}/archive/v${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/protobuf-2.6[python]
+		dev-python/pycrypto
+		dev-python/python-axolotl-curve25519"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/python-axolotl/python-axolotl-9999.ebuild b/dev-python/python-axolotl/python-axolotl-9999.ebuild
new file mode 100644
index 0000000..7ccdb7f
--- /dev/null
+++ b/dev-python/python-axolotl/python-axolotl-9999.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7)
+
+inherit distutils-r1 git-r3
+
+DESCRIPTION="python implementation of axolotl encryption"
+HOMEPAGE="https://github.com/tgalal/python-axolotl"
+EGIT_REPO_URI="https://github.com/tgalal/python-axolotl.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND=">=dev-libs/protobuf-2.6[python]
+		dev-python/pycrypto
+		dev-python/python-axolotl-curve25519"
+RDEPEND="${DEPEND}"
diff --git a/net-im/gajim-omemo/gajim-omemo-1.2.7.ebuild b/net-im/gajim-omemo/gajim-omemo-1.2.7.ebuild
new file mode 100644
index 0000000..519d687
--- /dev/null
+++ b/net-im/gajim-omemo/gajim-omemo-1.2.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Gajim plugin for XEP proposal: OMEMO Encryption"
+HOMEPAGE="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
+
+inherit git-r3
+EGIT_REPO_URI="https://dev.gajim.org/gajim/gajim-plugins.git"
+
+if [[ "${PV}" = "9999" ]] ; then
+	KEYWORDS=""
+else
+	EGIT_COMMIT="54b1b0e62c8283370fa3e8c409e9427c29e5ae17"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/python-axolotl
+		dev-python/qrcode
+		dev-python/cryptography"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+	local PLUGIN_DIR="/usr/share/gajim/plugins"
+	local OMEMO_PLUGIN_DIR="${PLUGIN_DIR}/omemo"
+	dodir "${PLUGIN_DIR}"
+	dodir "${OMEMO_PLUGIN_DIR}"
+	cp -pPR "${S}"/omemo/* "${D}/${OMEMO_PLUGIN_DIR}" || die "Installing files failed"
+}
diff --git a/net-im/gajim-omemo/gajim-omemo-9999.ebuild b/net-im/gajim-omemo/gajim-omemo-9999.ebuild
new file mode 100644
index 0000000..5e6d25d
--- /dev/null
+++ b/net-im/gajim-omemo/gajim-omemo-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Gajim plugin for XEP proposal: OMEMO Encryption"
+HOMEPAGE="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
+
+inherit git-r3
+EGIT_REPO_URI="https://dev.gajim.org/gajim/gajim-plugins.git"
+
+if [[ "${PV}" = "9999" ]] ; then
+	KEYWORDS=""
+else
+	EGIT_COMMIT="5a6d4d2679da188cae0323579c6ac9fa9b5a8dc9"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/python-axolotl
+		dev-python/qrcode
+		dev-python/cryptography"
+
+RDEPEND="${DEPEND}"
+
+src_install() {
+	local PLUGIN_DIR="/usr/share/gajim/plugins"
+	local OMEMO_PLUGIN_DIR="${PLUGIN_DIR}/omemo"
+	dodir "${PLUGIN_DIR}"
+	dodir "${OMEMO_PLUGIN_DIR}"
+	cp -pPR "${S}"/omemo/* "${D}/${OMEMO_PLUGIN_DIR}" || die "Installing files failed"
+}
diff --git a/net-im/gajim-omemo/metadata.xml b/net-im/gajim-omemo/metadata.xml
new file mode 100644
index 0000000..67bd002
--- /dev/null
+++ b/net-im/gajim-omemo/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>tk+gentoo@meskal.net</email>
+</maintainer>
+</pkgmetadata>