diff --git a/dev-python/configshell-fb/Manifest b/dev-python/configshell-fb/Manifest
new file mode 100644
index 0000000000000..2da50f79f0e37
--- /dev/null
+++ b/dev-python/configshell-fb/Manifest
@@ -0,0 +1 @@
+DIST configshell-fb-1.1.21.tar.gz 36929 SHA256 f96daac404e4483e9f3113fbd675264d14dce1db83155b8537c94c4267e9b740 SHA512 4cf353da513b0e6863a2f93086d98254c2a74596f52ea7fe8823dda7bec4c4c247b54ec277348264f6d33b576a581c7617da01891997e83619f84e9a4def3e57 WHIRLPOOL b7de33bde6891b40950b796fbf9ddbe15f7907860d5cc42097cc88f892989e0cb8f8b5f3ff3d2bf12b138e295385d048e154487356fb26352ef95572aa5ac923
diff --git a/dev-python/configshell-fb/configshell-fb-1.1.21.ebuild b/dev-python/configshell-fb/configshell-fb-1.1.21.ebuild
new file mode 100644
index 0000000000000..cc1ecc4018f5c
--- /dev/null
+++ b/dev-python/configshell-fb/configshell-fb-1.1.21.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 versionator
+
+MY_PV=$(replace_version_separator 2 '.fb' ${PV})
+
+DESCRIPTION="A Python library for building configuration shells"
+HOMEPAGE="https://github.com/open-iscsi/configshell-fb"
+SRC_URI="https://github.com/open-iscsi/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/urwid[${PYTHON_USEDEP}]
+	!dev-python/configshell"
+
+S=${WORKDIR}/${PN}-${MY_PV}
diff --git a/dev-python/configshell-fb/metadata.xml b/dev-python/configshell-fb/metadata.xml
new file mode 100644
index 0000000000000..7aebc11a062bf
--- /dev/null
+++ b/dev-python/configshell-fb/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>sir.suriv@gmail.com</email>
+	<name>Diogo Pereira</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription lang="en">
+	configshell-fb is a Python library that provides a framework
+	for building simple but nice CLI-based applications.
+</longdescription>
+<upstream>
+	<maintainer status="active">
+		<email>agrover@redhat.com</email>
+		<name>Andy Grover</name>
+	</maintainer>
+	<remote-id type="github">open-iscsi/configshell-fb</remote-id>
+	<bugs-to>https://github.com/open-iscsi/configshell-fb/issues</bugs-to>
+</upstream>
+</pkgmetadata>