diff --git a/dev-python/fedmsg/Manifest b/dev-python/fedmsg/Manifest
new file mode 100644
index 0000000000000..0b4dcf1a03585
--- /dev/null
+++ b/dev-python/fedmsg/Manifest
@@ -0,0 +1 @@
+DIST fedmsg-0.18.0.tar.gz 539333 SHA256 63ae0dd33032adbadbb710f5dc6aa03c6d60807bbce43c79a64e9ce8313cf307 SHA512 a103ef1aca70ccbf2a8dcbc5832cc09116969e201fd8129ca6ad9cb2c0075fcad700c210773251740e1568346abc1109948fd123f8bde70204bc08d638ead8d5 WHIRLPOOL bf0b3b10c5cf25c7722ce8403039ffa9c6367f0b6e3336f635f53ccd61a0720026472ef193e176427889cf2210299d00db9a93213e702e7ade7d7261595a55e3
diff --git a/dev-python/fedmsg/fedmsg-0.18.0.ebuild b/dev-python/fedmsg/fedmsg-0.18.0.ebuild
new file mode 100644
index 0000000000000..cb5937d130278
--- /dev/null
+++ b/dev-python/fedmsg/fedmsg-0.18.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit distutils-r1
+
+DESCRIPTION="Fedora Messaging Client API"
+HOMEPAGE="http://www.fedmsg.com/ https://pypi.python.org/pypi/fedmsg"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${PV}-endpoints.patch"
+		  "${FILESDIR}/${PV}-no_signatures.patch" )
+RDEPEND="
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/kitchen[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/arrow[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/m2crypto[${PYTHON_USEDEP}]' 'python2*')
+"
+DEPEND="${RDEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /etc/
+	doins -r "${S}/fedmsg.d"
+}
diff --git a/dev-python/fedmsg/files/0.18.0-endpoints.patch b/dev-python/fedmsg/files/0.18.0-endpoints.patch
new file mode 100644
index 0000000000000..857f6839b5e3a
--- /dev/null
+++ b/dev-python/fedmsg/files/0.18.0-endpoints.patch
@@ -0,0 +1,39 @@
+From 8bc5cbaa977b8de962f68ef84f6c8fadcb369c85 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 13 Nov 2016 09:12:20 +1300
+Subject: [PATCH 1/2] Adjust endpoints to be more suited to gentoo users
+
+---
+ fedmsg.d/endpoints.py | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/fedmsg.d/endpoints.py b/fedmsg.d/endpoints.py
+index 72c182a..c4eab16 100644
+--- a/fedmsg.d/endpoints.py
++++ b/fedmsg.d/endpoints.py
+@@ -24,15 +24,15 @@ config = dict(
+     endpoints={
+         # These are here so your local box can listen to the upstream
+         # infrastructure's bus.  Cool, right?  :)
+-        "fedora-infrastructure": [
+-            "tcp://hub.fedoraproject.org:9940",
+-            #"tcp://stg.fedoraproject.org:9940",
+-        ],
++        #"fedora-infrastructure": [
++        #    "tcp://hub.fedoraproject.org:9940",
++        #    #"tcp://stg.fedoraproject.org:9940",
++        #],
+         #"debian-infrastructure": [
+         #    "tcp://fedmsg.olasd.eu:9940",
+         #],
+-        #"anitya-public-relay": [
+-        #    "tcp://release-monitoring.org:9940",
+-        #],
++        "anitya-public-relay": [
++            "tcp://release-monitoring.org:9940",
++        ],
+     },
+ )
+-- 
+2.10.2
+
diff --git a/dev-python/fedmsg/files/0.18.0-no_signatures.patch b/dev-python/fedmsg/files/0.18.0-no_signatures.patch
new file mode 100644
index 0000000000000..8be69ad5ba81f
--- /dev/null
+++ b/dev-python/fedmsg/files/0.18.0-no_signatures.patch
@@ -0,0 +1,29 @@
+From 8f61441ba94f7f0bd2b2a1c900e20db038b7085f Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Sun, 13 Nov 2016 09:23:58 +1300
+Subject: [PATCH 2/2] Disable signature validation
+
+Signature validation currently requires M2Crypto and M2Ext,
+which are *only* available on Python2
+
+Python3 Implementations of Signature Validation appear currently broken
+---
+ fedmsg.d/ssl.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fedmsg.d/ssl.py b/fedmsg.d/ssl.py
+index c148667..f635ffb 100644
+--- a/fedmsg.d/ssl.py
++++ b/fedmsg.d/ssl.py
+@@ -25,7 +25,7 @@ here = os.getcwd()
+ 
+ config = dict(
+     sign_messages=False,
+-    validate_signatures=True,
++    validate_signatures=False,
+ 
+     # Use these implementations to sign and validate messages
+     crypto_backend='x509',
+-- 
+2.10.2
+
diff --git a/dev-python/fedmsg/metadata.xml b/dev-python/fedmsg/metadata.xml
new file mode 100644
index 0000000000000..7b208507f3ca4
--- /dev/null
+++ b/dev-python/fedmsg/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kentnl@gentoo.org</email>
+		<name>Kent Fredric</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>