diff --git a/srcpkgs/python-ipython-notebook b/srcpkgs/python-ipython-notebook
deleted file mode 120000
index 3c02370e4b5..00000000000
--- a/srcpkgs/python-ipython-notebook
+++ /dev/null
@@ -1 +0,0 @@
-python-ipython
\ No newline at end of file
diff --git a/srcpkgs/python-ipython-qtconsole b/srcpkgs/python-ipython-qtconsole
deleted file mode 120000
index 3c02370e4b5..00000000000
--- a/srcpkgs/python-ipython-qtconsole
+++ /dev/null
@@ -1 +0,0 @@
-python-ipython
\ No newline at end of file
diff --git a/srcpkgs/python-ipython/INSTALL.msg b/srcpkgs/python-ipython/INSTALL.msg
deleted file mode 100644
index 28875234e35..00000000000
--- a/srcpkgs/python-ipython/INSTALL.msg
+++ /dev/null
@@ -1,8 +0,0 @@
-This package contains the basic IPython terminal shell.
-
-For the Qt console install python-ipython-qtconsole.
-For the HTML notebook install python-ipython-notebook.
-For the matplotlib integration install python-matplotlib.
-
-To convert notebooks between various formats install the
-following dependencies: python-Sphinx, pandoc.
diff --git a/srcpkgs/python-ipython/patches/split-pkg.patch b/srcpkgs/python-ipython/patches/split-pkg.patch
deleted file mode 100644
index 9e5746f4f1d..00000000000
--- a/srcpkgs/python-ipython/patches/split-pkg.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: don't fail startup if ipython-notebook is not installed
- e.g. ipython locate triggers this code but doesn't need the notebook css files
---- IPython/core/profiledir.py
-+++ IPython/core/profiledir.py
-@@ -173,15 +173,18 @@ class ProfileDir(LoggingConfigurable):
-         self._mkdir(self.static_dir)
-         custom = os.path.join(self.static_dir, 'custom')
-         self._mkdir(custom)
--        from IPython.html import DEFAULT_STATIC_FILES_PATH
--        for fname in ('custom.js', 'custom.css'):
--            src = os.path.join(DEFAULT_STATIC_FILES_PATH, 'custom', fname)
--            dest = os.path.join(custom, fname)
--            if not os.path.exists(src):
--                self.log.warn("Could not copy default file to static dir. Source file %s does not exist.", src)
--                continue
--            if not os.path.exists(dest):
--                shutil.copy(src, dest)
-+        try:
-+            from IPython.html import DEFAULT_STATIC_FILES_PATH
-+            for fname in ('custom.js', 'custom.css'):
-+                src = os.path.join(DEFAULT_STATIC_FILES_PATH, 'custom', fname)
-+                dest = os.path.join(custom, fname)
-+                if not os.path.exists(src):
-+                    self.log.warn("Could not copy default file to static dir. Source file %s does not exist.", src)
-+                    continue
-+                if not os.path.exists(dest):
-+                    shutil.copy(src, dest)
-+        except ImportError:
-+            pass # ipython-notebook not installed
-
-     def check_dirs(self):
-         self.check_security_dir()
diff --git a/srcpkgs/python-ipython/python3.4-ipython.INSTALL.msg b/srcpkgs/python-ipython/python3.4-ipython.INSTALL.msg
deleted file mode 100644
index b9d6d4b33a0..00000000000
--- a/srcpkgs/python-ipython/python3.4-ipython.INSTALL.msg
+++ /dev/null
@@ -1,8 +0,0 @@
-This package contains the Python 3.4 variant of IPython terminal shell.
-
-For the Qt console install python3.4-ipython-qtconsole.
-For the HTML notebook install python3.4-ipython-notebook.
-For the matplotlib integration install python3.4-matplotlib.
-
-To convert notebooks between various formats install the following
-dependencies: python3.4-Sphinx, pandoc.
diff --git a/srcpkgs/python-ipython/template b/srcpkgs/python-ipython/template
index d5935a5a881..cdab20e42db 100644
--- a/srcpkgs/python-ipython/template
+++ b/srcpkgs/python-ipython/template
@@ -1,135 +1,50 @@
 # Template file for 'python-ipython'
 pkgname=python-ipython
-version=3.2.3
+version=4.0.1
 revision=1
 noarch=yes
 wrksrc="ipython-${version}"
 build_style=python-module
 python_versions="2.7 3.4"
-hostmakedepends="
- python-setuptools python3.4-setuptools python-Sphinx python3.4-Sphinx
- python-Pygments python3.4-Pygments python-tornado python3.4-tornado
- python-Jinja2 python3.4-Jinja2 python-pyzmq python3.4-pyzmq python-pexpect
- python3.4-pexpect"
-makedepends="${hostmakedepends}"
-depends="python-decorator python-path python-pexpect python-simplegeneric"
+hostmakedepends="python-setuptools python3.4-setuptools"
+depends="python-decorator python-pexpect python-pickleshare python-parsing
+ python-simplegeneric python-traitlets"
 pycompile_module="IPython"
 short_desc="Enhanced interactive Python2 shell"
-_short_desc="${short_desc/Python2/Python3.4}"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://ipython.org/"
 license="3-clause-BSD"
 distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz"
-checksum=2e9a467f918c68d2e4d744c7c62407ad2ba2db136c10afcc5bcadc00e983f02b
+checksum=3bd3b78abc4f43b9ea7fa5353a2a9ba01af8ac4aec5d11e78fa5cbcec105432e
+replaces="python-ipython-notebook<4.0.6 python-ipython-qtconsole<4.1.1"
 
-# explicit order, do not change
-subpackages="python-ipython-notebook python3.4-ipython-notebook python3.4-ipython"
-if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" python-ipython-qtconsole python3.4-ipython-qtconsole"
-fi
-
-pre_build() {
-	# remove shebangs
-	find IPython -type f -name '*.py' -exec sed -i '/^#!.*python$/d' {} +
-
-	# rename man pages
-	for f in docs/man/*; do
-		cp ${f} ${f/%.1/3.1}
-	done
-}
 post_install() {
-	# remove bundled libraries
-	for f in decorator{,s} path pexpect simplegeneric; do
-		find ${DESTDIR} -type f -name _${f}.py -delete
-	done
-
-	# remove qtconsole
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/IPython/qt
-
-	# use system mathjax
-	for pyver in $python_versions; do
-		ln -sf /usr/share/mathjax \
-			${DESTDIR}/usr/lib/python${pyver}/site-packages/IPython/html/static/mathjax
-	done
-
-	# drop '2' suffix from bin names
-	for f in ${DESTDIR}/usr/bin/*2; do
-		mv ${f} ${f/%2/}
-	done
-
-	# install qtconsole.desktop files
-	if [ -z "$CROSS_BUILD" ]; then
-		install -Dm644 "${wrksrc}/examples/IPython Kernel/ipython-qtconsole.desktop" \
-			${DESTDIR}/usr/share/applications/ipython-qtconsole.desktop
-		sed -i 's/ipython/&3/g;s/IPython/&3/g' \
-			"${wrksrc}/examples/IPython Kernel/ipython-qtconsole.desktop"
-		install -Dm644 "${wrksrc}/examples/IPython Kernel/ipython-qtconsole.desktop" \
-			${DESTDIR}/usr/share/applications/ipython3-qtconsole.desktop
-	fi
-
+	# use decorators of numpy
+	rm -f ${DESTDIR}/usr/lib/python*/site-packages/IPython/external/decorators/_decorators.py
+	# remove iptest
+	rm -f ${DESTDIR}/usr/bin/iptest*
+	# drop '2' suffix from ipython bin script
+	rm -f ${DESTDIR}/usr/bin/ipython
+	mv ${DESTDIR}/usr/bin/ipython{2,}
+	# create versioned ipython3 bin script and man page
+	mv ${DESTDIR}/usr/bin/ipython3{,.4}
+	vman docs/man/ipython.1 ipython3.4.1
 	# install license
 	vlicense COPYING.rst LICENSE
 }
 
-python-ipython-notebook_package() {
-	noarch=yes
-	depends="${sourcepkg}-${version}_${revision} python-pyzmq python-Jinja2
-	 python-tornado python-jsonschema python-Pygments python-mistune
-	 python-terminado mathjax"
-	short_desc+=" - HTML notebook"
-	pycompile_module="IPython"
-	pkg_install() {
-		vmove usr/lib/python2.7/site-packages/IPython/html
-	}
-}
-python-ipython-qtconsole_package() {
-	noarch=yes
-	depends="${sourcepkg}-${version}_${revision} python-pyzmq python-Pygments
-	 python-PyQt4 desktop-file-utils"
-	short_desc+=" - Qt console"
-	pycompile_module="IPython"
-	pkg_install() {
-		vmkdir usr/lib/python2.7/site-packages/IPython
-		vcopy ${wrksrc}/IPython/qt usr/lib/python2.7/site-packages/IPython
-		vmove usr/share/applications/ipython-qtconsole.desktop
-	}
-}
 python3.4-ipython_package() {
 	noarch=yes
-	depends="python3.4-decorator python3.4-path python3.4-pexpect
-	 python3.4-simplegeneric"
-	short_desc="${_short_desc}"
+	replaces="python3.4-ipython-notebook<4.0.6 python3.4-ipython-qtconsole<4.1.1"
+	depends="python3.4-decorator python3.4-pexpect python3.4-pickleshare
+	 python3.4-parsing python3.4-simplegeneric python3.4-traitlets"
 	pycompile_version="3.4"
 	pycompile_module="IPython"
+	short_desc="${short_desc/Python2/Python3.4}"
 	pkg_install() {
-		vmove usr/bin/*3
+		vmove usr/bin/ipython3.4
 		vmove usr/lib/python3.4
-		vmove usr/share/man/man1/*3.1
+		vmove usr/share/man/man1/ipython3.4.1
 		vlicense COPYING.rst LICENSE
 	}
 }
-python3.4-ipython-notebook_package() {
-	noarch=yes
-	depends="python3.4-ipython-${version}_${revision} python3.4-pyzmq
-	 python3.4-Jinja2 python3.4-tornado python3.4-jsonschema python3.4-Pygments
-	 python3.4-mistune python3.4-terminado mathjax"
-	short_desc="${_short_desc} - HTML notebook"
-	pycompile_version="3.4"
-	pycompile_module="IPython"
-	pkg_install() {
-		vmove usr/lib/python3.4/site-packages/IPython/html
-	}
-}
-python3.4-ipython-qtconsole_package() {
-	noarch=yes
-	depends="python3.4-ipython-${version}_${revision} python3.4-pyzmq
-	 python3.4-Pygments python3.4-PyQt4 desktop-file-utils"
-	short_desc="${_short_desc} - Qt console"
-	pycompile_version="3.4"
-	pycompile_module="IPython"
-	pkg_install() {
-		vmkdir usr/lib/python3.4/site-packages/IPython
-		vcopy ${wrksrc}/IPython/qt usr/lib/python3.4/site-packages/IPython
-		vmove usr/share/applications/ipython3-qtconsole.desktop
-	}
-}
diff --git a/srcpkgs/python3.4-ipython-notebook b/srcpkgs/python3.4-ipython-notebook
deleted file mode 120000
index 3c02370e4b5..00000000000
--- a/srcpkgs/python3.4-ipython-notebook
+++ /dev/null
@@ -1 +0,0 @@
-python-ipython
\ No newline at end of file
diff --git a/srcpkgs/python3.4-ipython-qtconsole b/srcpkgs/python3.4-ipython-qtconsole
deleted file mode 120000
index 3c02370e4b5..00000000000
--- a/srcpkgs/python3.4-ipython-qtconsole
+++ /dev/null
@@ -1 +0,0 @@
-python-ipython
\ No newline at end of file