diff --git a/dev-python/configshell/Manifest b/dev-python/configshell/Manifest
new file mode 100644
index 0000000000000..5a139eac58c5f
--- /dev/null
+++ b/dev-python/configshell/Manifest
@@ -0,0 +1 @@
+DIST configshell-1.6.tar.gz 37246 SHA256 e132fefa763b01c9443f299ae7b124041ffb7cc9c529e419d9c4116a94b85dd9 SHA512 04eeabfbe36f8845eb21cfe2b41a6a82d029ca23fe821ecfbf94d321fb8c9cc20f3d374b385cb20e00fd34a59feb364400d724e973174d9be90dad35813da0e0 WHIRLPOOL 6ebdb8d9b511945c8c065264d15c75ba2cf2bbfffac8b82c1c6b97bc224725898a6c7da9f65638a490a7d547f913a664b796eeda06658cf83982c408af2f8984
diff --git a/dev-python/configshell/configshell-1.6.ebuild b/dev-python/configshell/configshell-1.6.ebuild
new file mode 100644
index 0000000000000..dbc88ecbdaeb6
--- /dev/null
+++ b/dev-python/configshell/configshell-1.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="ConfigShell Community Edition for target_core_mod/ConfigFS"
+HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/Datera/${PN}.git
+		https://github.com/Datera/${PN}.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/Datera/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="dev-python/epydoc[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	dev-python/urwid[${PYTHON_USEDEP}]"