diff --git a/mingw-w64-python-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD
index 1ab8e8965d..94d2ecd3e1 100644
--- a/mingw-w64-python-matplotlib/PKGBUILD
+++ b/mingw-w64-python-matplotlib/PKGBUILD
@@ -7,8 +7,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=3.3.4
-pkgrel=4
+pkgver=3.5.1
+pkgrel=1
 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -18,16 +18,19 @@ depends=("${MINGW_PACKAGE_PREFIX}-python-pytz"
          "${MINGW_PACKAGE_PREFIX}-python-numpy"
          "${MINGW_PACKAGE_PREFIX}-python-cycler"
          "${MINGW_PACKAGE_PREFIX}-python-dateutil"
+         "${MINGW_PACKAGE_PREFIX}-python-fonttools"
          "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
          "${MINGW_PACKAGE_PREFIX}-python-pillow"
          "${MINGW_PACKAGE_PREFIX}-python-kiwisolver"
          "${MINGW_PACKAGE_PREFIX}-freetype"
-         "${MINGW_PACKAGE_PREFIX}-libpng"
          "${MINGW_PACKAGE_PREFIX}-qhull")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python"
              "${MINGW_PACKAGE_PREFIX}-python-setuptools"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm"
+             "${MINGW_PACKAGE_PREFIX}-python-setuptools-scm-git-archive"
              "${MINGW_PACKAGE_PREFIX}-python-certifi"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-pkg-config")
 optdepends=("${MINGW_PACKAGE_PREFIX}-python-pyqt5: Qt5Agg/Qt5Cairo backend"
             "${MINGW_PACKAGE_PREFIX}-gtk3: GTK3Agg/GTK3Cairo backend"
             "${MINGW_PACKAGE_PREFIX}-python-gobject: GTK3Agg/GTK3Cairo backend"
@@ -35,31 +38,37 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-python-pyqt5: Qt5Agg/Qt5Cairo backend"
             "${MINGW_PACKAGE_PREFIX}-python-tornado: WebAgg backend")
 source=("${_realname}-${pkgver}.tar.gz"::"https://pypi.io/packages/source/${_realname:0:1}/${_realname}/${_realname}-${pkgver}.tar.gz"
         setupext.py.patch)
-sha256sums=('3e477db76c22929e4c6876c44f88d790aacdf3c3f8f3a90cb1975c0bf37825b0'
-            '43a13325f23d2be8ef3b1c8f14be0640df690c52742101beb21f7c4eaad30425')
+sha256sums=('b2e9810e09c3a47b73ce9cab5a72243a1258f61e7900969097a817232246ce1c'
+            'a062e64775118de782b1995bd0b7b488de10cc5cbe8b5b834b79c0faea540826')
 
 prepare() {
   cd "${srcdir}/${_realname}-${pkgver}"
   patch -p1 -i ${srcdir}/setupext.py.patch
 
+  # Use system freetype and qhull
+  sed -e 's|#system_freetype = False|system_freetype = True|' -e 's|#system_qhull = False|system_qhull = True|' mplsetup.cfg.template > mplsetup.cfg
+
+  # Set version for setuptools_scm
+  export SETUPTOOLS_SCM_PRETEND_VERSION=${pkgver}
+
   cd ${srcdir}
-  rm -rf python-build-${CARCH} | true
-  cp -r "${_realname}-${pkgver}" "python-build-${CARCH}"
+  rm -rf python-build-${MSYSTEM} | true
+  cp -r "${_realname}-${pkgver}" "python-build-${MSYSTEM}"
 }
 
 build() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
     ${MINGW_PREFIX}/bin/python setup.py build
 }
 
 package() {
-  cd "${srcdir}/python-build-${CARCH}"
+  cd "${srcdir}/python-build-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
    ${MINGW_PREFIX}/bin/python setup.py install -O1 --skip-build \
    --root="${pkgdir}" --prefix=${MINGW_PREFIX}
 
-  install -Dm644 doc/users/license.rst "${pkgdir}${MINGW_PREFIX}"/share/licenses/python-matplotlib/LICENSE
+  install -Dm644 LICENSE/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE"
 }
diff --git a/mingw-w64-python-matplotlib/setupext.py.patch b/mingw-w64-python-matplotlib/setupext.py.patch
index 0f5662cf07..b3cbc90982 100644
--- a/mingw-w64-python-matplotlib/setupext.py.patch
+++ b/mingw-w64-python-matplotlib/setupext.py.patch
@@ -1,6 +1,6 @@
---- matplotlib-3.3.4/setupext.py.orig	2021-01-28 09:30:28.000000000 +0100
-+++ matplotlib-3.3.4/setupext.py	2021-02-07 12:11:03.590667300 +0100
-@@ -20,6 +20,7 @@
+--- a/setupext.py
++++ b/setupext.py
+@@ -19,6 +19,7 @@
  
  _log = logging.getLogger(__name__)
  
@@ -8,28 +8,28 @@
  
  def _get_xdg_cache_dir():
      """
-@@ -146,9 +147,9 @@
+@@ -188,9 +189,9 @@
  options = {
      'backend': config.get('rc_options', 'backend', fallback=None),
      'system_freetype': config.getboolean(
 -        'libs', 'system_freetype', fallback=sys.platform.startswith('aix')),
 +        'libs', 'system_freetype', fallback=sys.platform.startswith('aix') or MSYS),
-     'system_qhull': config.getboolean('libs', 'system_qhull',
--                                      fallback=False),
-+                                      fallback=False or MSYS),
+     'system_qhull': config.getboolean(
+-        'libs', 'system_qhull', fallback=False),
++        'libs', 'system_qhull', fallback=False or MSYS),
  }
  
  
-@@ -171,7 +172,7 @@
+@@ -213,7 +214,7 @@
      """
      Get path to pkg-config and set up the PKG_CONFIG environment variable.
      """
 -    if sys.platform == 'win32':
 +    if sys.platform == 'win32' and not MSYS:
          return None
-     pkg_config = os.environ.get('PKG_CONFIG', 'pkg-config')
+     pkg_config = os.environ.get('PKG_CONFIG') or 'pkg-config'
      if shutil.which(pkg_config) is None:
-@@ -223,7 +224,7 @@
+@@ -265,7 +266,7 @@
  
      # conda Windows header and library paths.
      # https://github.com/conda/conda/issues/2312 re: getting the env dir.