diff --git a/dev-python/prometheus_client/Manifest b/dev-python/prometheus_client/Manifest
new file mode 100644
index 0000000000000..1f782aef3a1e5
--- /dev/null
+++ b/dev-python/prometheus_client/Manifest
@@ -0,0 +1 @@
+DIST prometheus_client-0.0.18.tar.gz 38102 SHA256 ea484439f7484af1c9137324a6cb2e920a5b9e968a66dbd02700e0329b631e6d SHA512 97291948b9ccabec7747b1059d30c7707358a95b03d278037a4d7b02ee9d3390d995425891e4c6a59ffb7aedf1f957a31093d14ac1ed254764f5768ec3a7b784 WHIRLPOOL 5e873d242c98e77612a9a5b40872f7760411e6bb7aefe5491077d5e6a778ddccb420830ae32e8ea20e39e7711c7e166a91df1e8e67968a2c454ef4d3f0156242
diff --git a/dev-python/prometheus_client/metadata.xml b/dev-python/prometheus_client/metadata.xml
new file mode 100644
index 0000000000000..5357dd817d6d9
--- /dev/null
+++ b/dev-python/prometheus_client/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>mrueg@gentoo.org</email>
+    <name>Manuel Rüger</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">prometheus/client_python</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/prometheus_client/prometheus_client-0.0.18.ebuild b/dev-python/prometheus_client/prometheus_client-0.0.18.ebuild
new file mode 100644
index 0000000000000..21760f10345a5
--- /dev/null
+++ b/dev-python/prometheus_client/prometheus_client-0.0.18.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for the Prometheus monitoring system"
+HOMEPAGE="https://pypi.python.org/pypi/prometheus_client"
+SRC_URI="https://github.com/prometheus/client_python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+S=${WORKDIR}/client_python-${PV}
+
+RDEPEND="dev-python/twisted[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	pytest || die
+}