diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
new file mode 100644
index 0000000000000..df3833569e6e7
--- /dev/null
+++ b/dev-python/doc8/Manifest
@@ -0,0 +1 @@
+DIST doc8-0.6.0.tar.gz 21547 SHA256 42ccb69e9240546afec6cdae00b134592942b8b135d7017a748fd5af41e2d590 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75 WHIRLPOOL 4f5ad6df20c70d358af8b14bfbe6f11c24da8c8b38b59d4b4af60ab319037e0a30a2997f114191d10365b071adc216cc26a500e9ccf911b84165ba5582c75ab4
diff --git a/dev-python/doc8/doc8-0.6.0.ebuild b/dev-python/doc8/doc8-0.6.0.ebuild
new file mode 100644
index 0000000000000..1aa8a5f6207ff
--- /dev/null
+++ b/dev-python/doc8/doc8-0.6.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1
+
+DESCRIPTION="Style checker for Sphinx (or other) RST documentation"
+HOMEPAGE="http://git.openstack.org/cgit/stackforge/doc8"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/restructuredtext-lint-0.7[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/stevedore[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	sed -i '/^argparse/d' requirements.txt || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/doc8/metadata.xml b/dev-python/doc8/metadata.xml
new file mode 100644
index 0000000000000..d5dfd322223c4
--- /dev/null
+++ b/dev-python/doc8/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>