diff --git a/dev-python/ipykernel/ipykernel-4.2.2.ebuild b/dev-python/ipykernel/ipykernel-4.2.2.ebuild
index 1c84abb227f80..f92f84765ba6e 100644
--- a/dev-python/ipykernel/ipykernel-4.2.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,6 +22,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 	"
diff --git a/dev-python/ipykernel/ipykernel-4.3.1.ebuild b/dev-python/ipykernel/ipykernel-4.3.1.ebuild
index e6985ef4de506..608aee74cc654 100644
--- a/dev-python/ipykernel/ipykernel-4.3.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	dev-python/traitlets[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-4.4.1.ebuild b/dev-python/ipykernel/ipykernel-4.4.1.ebuild
index 2d2adf778c596..1e126fb6cc6cb 100644
--- a/dev-python/ipykernel/ipykernel-4.4.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,6 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-4.5.2.ebuild b/dev-python/ipykernel/ipykernel-4.5.2.ebuild
index 3e015222c8203..83d385129770b 100644
--- a/dev-python/ipykernel/ipykernel-4.5.2.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.5.2.ebuild
@@ -19,6 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild b/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild
new file mode 100644
index 0000000000000..ec1018dbdab05
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-4.6.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --verbose ipykernel || die
+}
diff --git a/dev-python/ipykernel/ipykernel-4.6.1.ebuild b/dev-python/ipykernel/ipykernel-4.6.1.ebuild
index d0ddc55f8daef..fc775127657e6 100644
--- a/dev-python/ipykernel/ipykernel-4.6.1.ebuild
+++ b/dev-python/ipykernel/ipykernel-4.6.1.ebuild
@@ -19,6 +19,7 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/ipython-4.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '<dev-python/ipython-6[${PYTHON_USEDEP}]' 'python2*')
 	dev-python/jupyter_client[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
 	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]