diff --git a/dev-python/whichcraft/Manifest b/dev-python/whichcraft/Manifest
new file mode 100644
index 0000000000000..c8c0b5c81205b
--- /dev/null
+++ b/dev-python/whichcraft/Manifest
@@ -0,0 +1 @@
+DIST whichcraft-0.4.0.tar.gz 8008 SHA256 0b3567c56fb224a418cafbec6115cb5ed1002b256a203f87f1361e9cfce3dd87 SHA512 ed077a0b8eddc720c3db251ebaaf2695e4f2ed827c941d6979533944a03d8efcfe7aabb9be0c34ba3f016c98921b519c2907e3510f255fb4f5067f1844e68d8f WHIRLPOOL a9785e848e195090efb1e9053f60f158070f5b55271cc5a56903ef10cdbe7be29eef94740971b1284da0a41cd9158e84c5b9c26b6deecc65041f3f29e48b3994
diff --git a/dev-python/whichcraft/metadata.xml b/dev-python/whichcraft/metadata.xml
new file mode 100644
index 0000000000000..7f4f33c6dbc92
--- /dev/null
+++ b/dev-python/whichcraft/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/whichcraft/whichcraft-0.4.0.ebuild b/dev-python/whichcraft/whichcraft-0.4.0.ebuild
new file mode 100644
index 0000000000000..563bbe4519a31
--- /dev/null
+++ b/dev-python/whichcraft/whichcraft-0.4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="This package provides cross-platform cross-python shutil.which functionality"
+HOMEPAGE="https://github.com/pydanny/whichcraft"
+SRC_URI="https://github.com/pydanny/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
+
+DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+python_test() {
+	${PYTHON} test_whichcraft.py || die
+}