diff --git a/mingw-w64-python-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD
deleted file mode 100644
index 17d19eca47..0000000000
--- a/mingw-w64-python-matplotlib/PKGBUILD
+++ /dev/null
@@ -1,144 +0,0 @@
-# Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com >
-
-_realname=matplotlib
-pkgbase=mingw-w64-python-${_realname}
-pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=2.2.3
-pkgrel=3
-pkgdesc="A python plotting library, making publication quality plots (mingw-w64)"
-arch=('any')
-url='https://matplotlib.org/'
-license=('custom')
-makedepends=(
-            "${MINGW_PACKAGE_PREFIX}-python2"
-            "${MINGW_PACKAGE_PREFIX}-python3"
-            "${MINGW_PACKAGE_PREFIX}-python2-setuptools"
-            "${MINGW_PACKAGE_PREFIX}-python3-setuptools"
-            "${MINGW_PACKAGE_PREFIX}-python2-pytz"
-            "${MINGW_PACKAGE_PREFIX}-python3-pytz"
-            "${MINGW_PACKAGE_PREFIX}-python2-numpy"
-            "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-            "${MINGW_PACKAGE_PREFIX}-python2-cairo"
-            "${MINGW_PACKAGE_PREFIX}-python3-cairo"
-            "${MINGW_PACKAGE_PREFIX}-python2-pyqt5"
-            "${MINGW_PACKAGE_PREFIX}-python3-pyqt5"
-            "${MINGW_PACKAGE_PREFIX}-python2-dateutil"
-            "${MINGW_PACKAGE_PREFIX}-python3-dateutil"
-            "${MINGW_PACKAGE_PREFIX}-python2-pyparsing"
-            "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
-            "${MINGW_PACKAGE_PREFIX}-python2-cycler"
-            "${MINGW_PACKAGE_PREFIX}-python3-cycler"
-            "${MINGW_PACKAGE_PREFIX}-python2-kiwisolver"
-            "${MINGW_PACKAGE_PREFIX}-python3-kiwisolver"
-            "${MINGW_PACKAGE_PREFIX}-python2-backports.functools_lru_cache"
-            "${MINGW_PACKAGE_PREFIX}-freetype"
-            "${MINGW_PACKAGE_PREFIX}-libpng"
-            #"${MINGW_PACKAGE_PREFIX}-qhull"
-            )
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v${pkgver}.tar.gz"
-        setupext.py.patch
-        setup.py.patch)
-sha256sums=('da5b804222864a8e854ed68f16dcbc8b2fa096537d84f879cc8289db368735c8'
-            '7ecd678f2325486fc79998dd11f79a5c0e0284d3c4260678f47c4b24d0a3d893'
-            '2ace7d4fe23ba9e96f2c81f827c8ea6bc65c532e6bd4eee3a655aae1ae6dab17')
-noextract=("${_realname}-${pkgver}.tar.gz")
-
-prepare() {
-  # Clean up old sources so re-patching doesn't fail.
-  [[ -d ${srcdir}/${_realname}-${pkgver} ]] && rm -rf $srcdir/${_realname}-${pkgver}
-  tar -xzvf ${_realname}-${pkgver}.tar.gz -C ${srcdir}
-
-  cd ${srcdir}/${_realname}-${pkgver}
-  patch -p1 -i ${srcdir}/setupext.py.patch
-  patch -p1 -i ${srcdir}/setup.py.patch
-  cd ${srcdir}
-
-  cp -a ${_realname}-${pkgver} ${_realname}-py2-${pkgver}
-  cp -a ${_realname}-${pkgver} ${_realname}-py3-${pkgver}
-
-  cd ${srcdir}/${_realname}-py3-${pkgver}
-  # remove cairo which fails for python3
-  sed -i 's/setupext\.BackendGtk3Cairo/#setupext\.BackendGtk3Cairo/g' setup.py
-  sed -i 's/setupext\.BackendCairo/#setupext\.BackendCairo/g' setup.py
-
-  cd ${srcdir}/${_realname}-py2-${pkgver}
-  sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/env python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
-    -i $(find . -name '*.py')
-}
-
-build() {
-  cd ${srcdir}/${_realname}-py2-${pkgver}
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python2 setup.py build
-
-  cd ${srcdir}/${_realname}-py3-${pkgver}
-  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-  ${MINGW_PREFIX}/bin/python3 setup.py build
-}
-
-package_python3-matplotlib() {
-    depends=(
-        "${MINGW_PACKAGE_PREFIX}-python3-pytz"
-        "${MINGW_PACKAGE_PREFIX}-python3-numpy"
-        "${MINGW_PACKAGE_PREFIX}-python3-cairo"
-        "${MINGW_PACKAGE_PREFIX}-python3-cycler"
-        "${MINGW_PACKAGE_PREFIX}-python3-pyqt5"
-        "${MINGW_PACKAGE_PREFIX}-python3-dateutil"
-        "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
-        "${MINGW_PACKAGE_PREFIX}-python3-kiwisolver"
-        "${MINGW_PACKAGE_PREFIX}-freetype"
-        "${MINGW_PACKAGE_PREFIX}-libpng"
-        #"${MINGW_PACKAGE_PREFIX}-qhull"
-    )
-   cd ${srcdir}/${_realname}-py3-${pkgver}
-
-   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-   ${MINGW_PREFIX}/bin/python3 setup.py install -O1 --skip-build \
-   --root="${pkgdir}" --prefix=${MINGW_PREFIX}
-
-   install -Dm644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-matplotlib/LICENSE
-}
-
-package_python2-matplotlib() {
-    depends=(
-        "${MINGW_PACKAGE_PREFIX}-python2-pytz"
-        "${MINGW_PACKAGE_PREFIX}-python2-numpy"
-        "${MINGW_PACKAGE_PREFIX}-python2-cairo"
-        "${MINGW_PACKAGE_PREFIX}-python2-cycler"
-        "${MINGW_PACKAGE_PREFIX}-python2-pyqt5"
-        "${MINGW_PACKAGE_PREFIX}-python2-dateutil"
-        "${MINGW_PACKAGE_PREFIX}-python2-pyparsing"
-        "${MINGW_PACKAGE_PREFIX}-python2-kiwisolver"
-        "${MINGW_PACKAGE_PREFIX}-python2-backports.functools_lru_cache"
-        "${MINGW_PACKAGE_PREFIX}-freetype"
-        "${MINGW_PACKAGE_PREFIX}-libpng"
-        #"${MINGW_PACKAGE_PREFIX}-qhull"
-    )
-   cd ${srcdir}/${_realname}-py2-${pkgver}
-
-   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
-   ${MINGW_PREFIX}/bin/python2 setup.py install -O1 --skip-build \
-   --root="${pkgdir}" --prefix=${MINGW_PREFIX}
-
-   install -Dm644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python2-matplotlib/LICENSE
-}
-
-package_mingw-w64-i686-python2-matplotlib() {
-  package_python2-matplotlib
-}
-
-package_mingw-w64-i686-python3-matplotlib() {
-  package_python3-matplotlib
-}
-
-package_mingw-w64-x86_64-python2-matplotlib() {
-  package_python2-matplotlib
-}
-
-package_mingw-w64-x86_64-python3-matplotlib() {
-  package_python3-matplotlib
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/mingw-w64-python2-matplotlib/PKGBUILD b/mingw-w64-python2-matplotlib/PKGBUILD
new file mode 100644
index 0000000000..1b91de78f7
--- /dev/null
+++ b/mingw-w64-python2-matplotlib/PKGBUILD
@@ -0,0 +1,56 @@
+# Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com >
+
+_realname=matplotlib
+pkgbase=mingw-w64-python2-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}")
+pkgver=2.2.3
+pkgrel=4
+pkgdesc="A python plotting library, making publication quality plots (mingw-w64)"
+arch=('any')
+url='https://matplotlib.org/'
+license=('custom')
+depends=("${MINGW_PACKAGE_PREFIX}-python2-pytz"
+         "${MINGW_PACKAGE_PREFIX}-python2-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python2-cairo"
+         "${MINGW_PACKAGE_PREFIX}-python2-cycler"
+         "${MINGW_PACKAGE_PREFIX}-python2-pyqt5"
+         "${MINGW_PACKAGE_PREFIX}-python2-dateutil"
+         "${MINGW_PACKAGE_PREFIX}-python2-pyparsing"
+         "${MINGW_PACKAGE_PREFIX}-python2-kiwisolver"
+         "${MINGW_PACKAGE_PREFIX}-python2-backports.functools_lru_cache"
+         "${MINGW_PACKAGE_PREFIX}-freetype"
+         "${MINGW_PACKAGE_PREFIX}-libpng"
+         #"${MINGW_PACKAGE_PREFIX}-qhull"
+         )
+makedepends=("${MINGW_PACKAGE_PREFIX}-python2"
+             "${MINGW_PACKAGE_PREFIX}-python2-setuptools")
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v${pkgver}.tar.gz"
+        setupext.py.patch
+        setup.py.patch)
+sha256sums=('da5b804222864a8e854ed68f16dcbc8b2fa096537d84f879cc8289db368735c8'
+            '7ecd678f2325486fc79998dd11f79a5c0e0284d3c4260678f47c4b24d0a3d893'
+            '2ace7d4fe23ba9e96f2c81f827c8ea6bc65c532e6bd4eee3a655aae1ae6dab17')
+
+prepare() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  patch -p1 -i ${srcdir}/setupext.py.patch
+  patch -p1 -i ${srcdir}/setup.py.patch
+}
+
+build() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+  ${MINGW_PREFIX}/bin/python2 setup.py install -O1 --skip-build \
+    --root="${pkgdir}" --prefix=${MINGW_PREFIX}
+
+  install -Dm644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python2-matplotlib/LICENSE
+}
diff --git a/mingw-w64-python-matplotlib/setup.py.patch b/mingw-w64-python2-matplotlib/setup.py.patch
similarity index 100%
rename from mingw-w64-python-matplotlib/setup.py.patch
rename to mingw-w64-python2-matplotlib/setup.py.patch
diff --git a/mingw-w64-python-matplotlib/setupext.py.patch b/mingw-w64-python2-matplotlib/setupext.py.patch
similarity index 100%
rename from mingw-w64-python-matplotlib/setupext.py.patch
rename to mingw-w64-python2-matplotlib/setupext.py.patch
diff --git a/mingw-w64-python3-matplotlib/PKGBUILD b/mingw-w64-python3-matplotlib/PKGBUILD
new file mode 100644
index 0000000000..eea8aecc23
--- /dev/null
+++ b/mingw-w64-python3-matplotlib/PKGBUILD
@@ -0,0 +1,54 @@
+# Contributor: Christoph Reiter <reiter.chrsitoph@gmail.com>
+
+_realname=matplotlib
+pkgbase=mingw-w64-python3-${_realname}
+pkgname=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
+pkgver=3.0.0
+pkgrel=1
+pkgdesc="A python plotting library, making publication quality plots (mingw-w64)"
+arch=('any')
+url='https://matplotlib.org/'
+license=('custom')
+depends=("${MINGW_PACKAGE_PREFIX}-python3-pytz"
+         "${MINGW_PACKAGE_PREFIX}-python3-numpy"
+         "${MINGW_PACKAGE_PREFIX}-python3-cycler"
+         "${MINGW_PACKAGE_PREFIX}-python3-dateutil"
+         "${MINGW_PACKAGE_PREFIX}-python3-pyparsing"
+         "${MINGW_PACKAGE_PREFIX}-python3-kiwisolver"
+         "${MINGW_PACKAGE_PREFIX}-freetype"
+         "${MINGW_PACKAGE_PREFIX}-libpng")
+makedepends=("${MINGW_PACKAGE_PREFIX}-python3"
+             "${MINGW_PACKAGE_PREFIX}-python3-setuptools")
+optdepends=("${MINGW_PACKAGE_PREFIX}-python3-pyqt5: Qt5Agg/Qt5Cairo backend"
+            "${MINGW_PACKAGE_PREFIX}-gtk3: GTK3Agg/GTK3Cairo backend"
+            "${MINGW_PACKAGE_PREFIX}-python3-gobject: GTK3Agg/GTK3Cairo backend"
+            "${MINGW_PACKAGE_PREFIX}-python3-cairo: cairo/GTK3Cairo/Qt5Cairo backend"
+            "${MINGW_PACKAGE_PREFIX}-python3-tornado: WebAgg backend")
+
+source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v${pkgver}.tar.gz"
+        setupext.py.patch)
+sha256sums=('4ab565581e3012fec06f93fc181d719a6f214f34c5b2a9f808741f0097507ea4'
+            '4a40f33ceda86f4a70d71fc97f28e799fe6973f9358fd9d1dac9b40cc2f0c7fc')
+
+prepare() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  patch -p1 -i ${srcdir}/setupext.py.patch
+}
+
+build() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+
+  MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python3 setup.py build
+}
+
+package() {
+   cd "${srcdir}/${_realname}-${pkgver}"
+
+   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
+    ${MINGW_PREFIX}/bin/python3 setup.py install -O1 --skip-build \
+    --root="${pkgdir}" --prefix=${MINGW_PREFIX}
+
+   install -Dm644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python3-matplotlib/LICENSE
+}
diff --git a/mingw-w64-python3-matplotlib/setupext.py.patch b/mingw-w64-python3-matplotlib/setupext.py.patch
new file mode 100644
index 0000000000..b5e6d33637
--- /dev/null
+++ b/mingw-w64-python3-matplotlib/setupext.py.patch
@@ -0,0 +1,37 @@
+--- matplotlib-3.0.0/setupext.py.orig	2018-09-18 05:17:52.000000000 +0200
++++ matplotlib-3.0.0/setupext.py	2018-09-20 12:51:06.529116400 +0200
+@@ -22,6 +22,7 @@
+ import setuptools
+ import versioneer
+ 
++MSYS = "MSYSTEM" in os.environ
+ 
+ def _get_xdg_cache_dir():
+     """
+@@ -267,7 +268,7 @@
+         """
+         Determines whether pkg-config exists on this machine.
+         """
+-        if sys.platform == 'win32':
++        if sys.platform == 'win32' and not MSYS:
+             self.has_pkgconfig = False
+         else:
+             self.pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
+@@ -946,7 +947,7 @@
+         if options.get('local_freetype'):
+             return "Using local version for testing"
+ 
+-        if sys.platform == 'win32':
++        if sys.platform == 'win32' and not MSYS:
+             try:
+                 check_include_file(get_include_dirs(), 'ft2build.h', 'freetype')
+             except CheckFailed:
+@@ -1176,7 +1177,7 @@
+         }
+ 
+     def check(self):
+-        if sys.platform == 'win32':
++        if sys.platform == 'win32' and not MSYS:
+             check_include_file(get_include_dirs(), 'png.h', 'png')
+             return 'Using unknown version found on system.'
+