diff --git a/mingw-w64-python-ipython/PKGBUILD b/mingw-w64-python-ipython/PKGBUILD
deleted file mode 100644
index b77be7dac6..0000000000
--- a/mingw-w64-python-ipython/PKGBUILD
+++ /dev/null
@@ -1,131 +0,0 @@
-# Maintainer: Kyle Kauffman <kyle.j.kauffman@gmail.com>
-
-_realname=ipython
-pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=5.3.0
-pkgrel=1
-pkgdesc="An enhanced Interactive Python shell (mingw-w64)"
-arch=('any')
-url="http://ipython.org"
-license=('BSD')
-makedepends=("${MINGW_PACKAGE_PREFIX}-sqlite3"
-             "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
-             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
-
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/ipython/archive/$pkgver.tar.gz"
-        0001-unimplemented-readline-calls.patch)
-sha256sums=('8c6e0be8d11b85641eb6e738975e4c91a03db08702f39c45c4ff42c6e43b8754'
-            'cd6dac2442a2477c28096d87cdb7f38ef46b9d3341920d9e88396288a81bfbe2')
-
-prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-  patch -p1 -i ${srcdir}/0001-unimplemented-readline-calls.patch
-}
-
-all_build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
-
-  # see https://github.com/ipython/ipython/issues/2057
-  #export LC_ALL=en_US.UTF-8
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/${1} setup.py install \
-    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
-
-  find "${pkgdir}/" -name "*.pyc" -delete
-  find "${pkgdir}/" -type d -empty -delete
-
-  # setuptools doesnt see mingw-w64-python's readline
-  find "${pkgdir}/" -name 'requires.txt' -delete
-
-  local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
-  # fix python command in files
-  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.cmd; do
-    sed -e "s|${PREFIX_WIN}/bin/||g" -i ${_f}
-  done
-  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*; do
-    sed -e "s|${PREFIX_WIN}/bin/|/usr/bin/env |g" -i ${_f}
-  done
-}
-
-package_python3-ipython() {
-  local interpreter=python3
-  #install=ipython3-${CARCH}.install
-  depends=("${MINGW_PACKAGE_PREFIX}-sqlite3"
-           "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-           "${MINGW_PACKAGE_PREFIX}-python3-traitlets"
-           "${MINGW_PACKAGE_PREFIX}-python3-simplegeneric"
-           "${MINGW_PACKAGE_PREFIX}-python3-pickleshare"
-           "${MINGW_PACKAGE_PREFIX}-python3-prompt_toolkit"
-           "${MINGW_PACKAGE_PREFIX}-python3-win_unicode_console")
-  optdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose: for IPython's test suite"
-              "${MINGW_PACKAGE_PREFIX}-python3-pyqt4: for ipython qtconsole"
-              "${MINGW_PACKAGE_PREFIX}-python3-sip: for ipython qtconsole"
-              "${MINGW_PACKAGE_PREFIX}-python3-pygments: for ipython qtconsole"
-              "${MINGW_PACKAGE_PREFIX}-python3-jinja: for ipython notebook")
-#              "${MINGW_PACKAGE_PREFIX}-haskell-pandoc: ipython notebook conversion"
-#              "${MINGW_PACKAGE_PREFIX}-python3-pyzmq: ipython notebook and ipython qtconcole"
-#              "${MINGW_PACKAGE_PREFIX}-python3-tornado: for ipython notebook"
-
-  all_build ${interpreter}
-
-  install -Dm644 docs/source/about/license_and_copyright.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/ipython/LICENSE"
-
-}
-
-package_python2-ipython() {
-  local interpreter=python2
-  #install=ipython2-${CARCH}.install
-  depends=("${MINGW_PACKAGE_PREFIX}-sqlite3"
-           "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
-           "${MINGW_PACKAGE_PREFIX}-python2-traitlets"
-           "${MINGW_PACKAGE_PREFIX}-python2-simplegeneric"
-           "${MINGW_PACKAGE_PREFIX}-python2-pickleshare"
-           "${MINGW_PACKAGE_PREFIX}-python2-prompt_toolkit"
-           "${MINGW_PACKAGE_PREFIX}-python2-win_unicode_console")
-  optdepends=("${MINGW_PACKAGE_PREFIX}-python2-nose: for IPython's test suite"
-              "${MINGW_PACKAGE_PREFIX}-python2-pyqt4: for ipython qtconsole"
-              "${MINGW_PACKAGE_PREFIX}-python2-sip: for ipython qtconsole"
-              "${MINGW_PACKAGE_PREFIX}-python2-pygments: for ipython qtconsole"
-              "${MINGW_PACKAGE_PREFIX}-python2-jinja: for ipython notebook")
-#              "${MINGW_PACKAGE_PREFIX}-haskell-pandoc: ipython notebook conversion"
-#              "${MINGW_PACKAGE_PREFIX}-python2-pyzmq: ipython notebook and ipython qtconcole"
-#              "${MINGW_PACKAGE_PREFIX}-python2-tornado: for ipython notebook"
-
-  all_build ${interpreter}
-  for file_script in iptest ipython; do
-    rm ${pkgdir}${MINGW_PREFIX}/bin/${file_script}{,.cmd}
-  done
-
-  install -Dm644 docs/source/about/license_and_copyright.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/ipython2/LICENSE"
-
-  # Fix bin collisions
-  find "${pkgdir}${MINGW_PREFIX}/bin/" -type f -regex '.*[^2].exe$' -delete
-  find "${pkgdir}${MINGW_PREFIX}/bin/" -type f -regex '.*[^2]-script.py$' -delete
-  find "${pkgdir}${MINGW_PREFIX}/bin/" -type f -regex '.*[^2].exe.manifest$' -delete
-
-  # Fix manpage collisions
-  cd "${pkgdir}${MINGW_PREFIX}/share/man/man1/"
-  for i in *; do
-    mv ${i} ${i/%.1/2.1}
-  done
-
-}
-
-package_mingw-w64-i686-python2-ipython() {
-  package_python2-ipython
-}
-
-package_mingw-w64-i686-python3-ipython() {
-  package_python3-ipython
-}
-
-package_mingw-w64-x86_64-python2-ipython() {
-  package_python2-ipython
-}
-
-package_mingw-w64-x86_64-python3-ipython() {
-  package_python3-ipython
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/mingw-w64-python-ipython/0001-unimplemented-readline-calls.patch b/mingw-w64-python2-ipython/0001-unimplemented-readline-calls.patch
similarity index 100%
rename from mingw-w64-python-ipython/0001-unimplemented-readline-calls.patch
rename to mingw-w64-python2-ipython/0001-unimplemented-readline-calls.patch
diff --git a/mingw-w64-python2-ipython/PKGBUILD b/mingw-w64-python2-ipython/PKGBUILD
new file mode 100644
index 0000000000..c0ba60d520
--- /dev/null
+++ b/mingw-w64-python2-ipython/PKGBUILD
@@ -0,0 +1,84 @@
+# Maintainer: Kyle Kauffman <kyle.j.kauffman@gmail.com>
+
+_realname=ipython
+pkgbase=mingw-w64-python-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
+pkgver=5.3.0
+pkgrel=6
+pkgdesc="An enhanced Interactive Python shell (mingw-w64)"
+arch=('any')
+url="http://ipython.org"
+license=('BSD')
+#install=ipython2-${CARCH}.install
+depends=("${MINGW_PACKAGE_PREFIX}-sqlite3"
+         "${MINGW_PACKAGE_PREFIX}-python2-traitlets"
+         "${MINGW_PACKAGE_PREFIX}-python2-simplegeneric"
+         "${MINGW_PACKAGE_PREFIX}-python2-pickleshare"
+         "${MINGW_PACKAGE_PREFIX}-python2-prompt_toolkit"
+         "${MINGW_PACKAGE_PREFIX}-python2-win_unicode_console")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python2-nose: for IPython's test suite"
+            "${MINGW_PACKAGE_PREFIX}-python2-pyqt4: for ipython qtconsole"
+            "${MINGW_PACKAGE_PREFIX}-python2-sip: for ipython qtconsole"
+            "${MINGW_PACKAGE_PREFIX}-python2-pygments: for ipython qtconsole"
+            "${MINGW_PACKAGE_PREFIX}-python2-jinja: for ipython notebook")
+#            "${MINGW_PACKAGE_PREFIX}-haskell-pandoc: ipython notebook conversion"
+#            "${MINGW_PACKAGE_PREFIX}-python2-pyzmq: ipython notebook and ipython qtconcole"
+#            "${MINGW_PACKAGE_PREFIX}-python2-tornado: for ipython notebook"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools")
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/ipython/archive/${pkgver}.tar.gz"
+        0001-unimplemented-readline-calls.patch)
+sha256sums=('8c6e0be8d11b85641eb6e738975e4c91a03db08702f39c45c4ff42c6e43b8754'
+            'cd6dac2442a2477c28096d87cdb7f38ef46b9d3341920d9e88396288a81bfbe2')
+
+prepare() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+  patch -p1 -i ${srcdir}/0001-unimplemented-readline-calls.patch
+}
+
+all_build() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  # see https://github.com/ipython/ipython/issues/2057
+  #export LC_ALL=en_US.UTF-8
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/${1} setup.py install \
+    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
+
+  find "${pkgdir}/" -name "*.pyc" -delete
+  find "${pkgdir}/" -type d -empty -delete
+
+  # setuptools doesnt see mingw-w64-python's readline
+  find "${pkgdir}/" -name 'requires.txt' -delete
+
+  local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
+  # fix python command in files
+  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.cmd; do
+    sed -e "s|${PREFIX_WIN}/bin/||g" -i ${_f}
+  done
+  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*; do
+    sed -e "s|${PREFIX_WIN}/bin/|/usr/bin/env |g" -i ${_f}
+  done
+}
+
+package() {
+  local interpreter=python2
+
+  all_build ${interpreter}
+  for file_script in iptest ipython; do
+    rm ${pkgdir}${MINGW_PREFIX}/bin/${file_script}{,.cmd}
+  done
+
+  install -Dm644 docs/source/about/license_and_copyright.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/ipython2/LICENSE"
+
+  # Fix bin collisions
+  find "${pkgdir}${MINGW_PREFIX}/bin/" -type f -regex '.*[^2].exe$' -delete
+  find "${pkgdir}${MINGW_PREFIX}/bin/" -type f -regex '.*[^2]-script.py$' -delete
+  find "${pkgdir}${MINGW_PREFIX}/bin/" -type f -regex '.*[^2].exe.manifest$' -delete
+
+  # Fix manpage collisions
+  cd "${pkgdir}${MINGW_PREFIX}/share/man/man1/"
+  for i in *; do
+    mv ${i} ${i/%.1/2.1}
+  done
+
+}
diff --git a/mingw-w64-python3-ipython/PKGBUILD b/mingw-w64-python3-ipython/PKGBUILD
new file mode 100644
index 0000000000..f1b657c342
--- /dev/null
+++ b/mingw-w64-python3-ipython/PKGBUILD
@@ -0,0 +1,63 @@
+# Maintainer: Kyle Kauffman <kyle.j.kauffman@gmail.com>
+
+_realname=ipython
+pkgbase=mingw-w64-python3-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=6.1.0
+pkgrel=1
+pkgdesc="An enhanced Interactive Python shell (mingw-w64)"
+arch=('any')
+url="http://ipython.org"
+license=('BSD')
+#install=ipython3-${CARCH}.install
+depends=("${MINGW_PACKAGE_PREFIX}-sqlite3"
+         "${MINGW_PACKAGE_PREFIX}-python3-traitlets"
+         "${MINGW_PACKAGE_PREFIX}-python3-simplegeneric"
+         "${MINGW_PACKAGE_PREFIX}-python3-pickleshare"
+         "${MINGW_PACKAGE_PREFIX}-python3-prompt_toolkit"
+         "${MINGW_PACKAGE_PREFIX}-python3-win_unicode_console")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose: for IPython's test suite"
+            "${MINGW_PACKAGE_PREFIX}-python3-pyqt4: for ipython qtconsole"
+            "${MINGW_PACKAGE_PREFIX}-python3-sip: for ipython qtconsole"
+            "${MINGW_PACKAGE_PREFIX}-python3-pygments: for ipython qtconsole"
+            "${MINGW_PACKAGE_PREFIX}-python3-jinja: for ipython notebook")
+#              "${MINGW_PACKAGE_PREFIX}-haskell-pandoc: ipython notebook conversion"
+#              "${MINGW_PACKAGE_PREFIX}-python3-pyzmq: ipython notebook and ipython qtconcole"
+#              "${MINGW_PACKAGE_PREFIX}-python3-tornado: for ipython notebook"
+makedepends=("${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+source=("${_realname}-${pkgver}.tar.gz::https://github.com/ipython/ipython/archive/${pkgver}.tar.gz")
+sha256sums=('c570a80a29100664a79429d3863389fa5f53102292b3a7789d93416a2d7681cf')
+
+all_build() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  # see https://github.com/ipython/ipython/issues/2057
+  #export LC_ALL=en_US.UTF-8
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/${1} setup.py install \
+    --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1
+
+  find "${pkgdir}/" -name "*.pyc" -delete
+  find "${pkgdir}/" -type d -empty -delete
+
+  # setuptools doesnt see mingw-w64-python's readline
+  find "${pkgdir}/" -name 'requires.txt' -delete
+
+  local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX})
+  # fix python command in files
+  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.cmd; do
+    sed -e "s|${PREFIX_WIN}/bin/||g" -i ${_f}
+  done
+  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*; do
+    sed -e "s|${PREFIX_WIN}/bin/|/usr/bin/env |g" -i ${_f}
+  done
+}
+
+package() {
+  local interpreter=python3
+
+  all_build ${interpreter}
+
+  install -Dm644 docs/source/about/license_and_copyright.rst "${pkgdir}${MINGW_PREFIX}/share/licenses/ipython/LICENSE"
+
+}