diff --git a/dev-python/ptpython/Manifest b/dev-python/ptpython/Manifest
index e55979dabbdc6..561fdfcd8b0a4 100644
--- a/dev-python/ptpython/Manifest
+++ b/dev-python/ptpython/Manifest
@@ -1 +1,2 @@
 DIST ptpython-0.20.tar.gz 29618 SHA256 a6ebe6f6e496693c69f460e46296492832b47997a0feea069b386cf9bee5bc4f SHA512 2ff701d65f449676bd51cad6287723497a6ff8dd2dda5daf992125892c9d1131bfce7c648e8d53260e9d9a33d648ed1b97bb32f60253c106e6f96a58dcece848 WHIRLPOOL c5ab855f747f785c5c29f54346eac6285779dfea054073caea4769e6a92593e48fc84fc2ed69cfcc6f44b17e1323f646c8a6070c892bcf1caf66f128ea748ff6
+DIST ptpython-0.21.tar.gz 27410 SHA256 37aad517cf9d55e567697fe001bc2d07e7013753218537f78425c2bac1181a0b SHA512 d85c7167932cfc033324bf62e96b27ee9296eab92fc1f3ce9e4afac5af6f4e5bfaee1950fcdc76121acd7176efe79c61d6cb2b06a59e7a9a5c5c34a1b41a64d1 WHIRLPOOL 5290c0389893c13c8f4a69a4726faea984be62748ce0beff400e7b7eb8ef5fe1a352f0e37a2afc991d869d69c9afeaaee3c76a00c1157037bd35227d1837285f
diff --git a/dev-python/ptpython/ptpython-0.21.ebuild b/dev-python/ptpython/ptpython-0.21.ebuild
new file mode 100644
index 0000000000000..b5b10e0f12e88
--- /dev/null
+++ b/dev-python/ptpython/ptpython-0.21.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Python REPL build on top of prompt_toolkit"
+HOMEPAGE="https://pypi.python.org/pypi/ptpython/ https://github.com/jonathanslenders/ptpython"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/prompt_toolkit-0.46[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.9.0[${PYTHON_USEDEP}]
+	dev-python/docopt[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+pkg_postinst() {
+	optfeature "ipython enhanced version" dev-python/ipython
+}