diff --git a/glibc233.patch b/glibc233.patch
new file mode 100644
index 0000000..1046dbe
--- /dev/null
+++ b/glibc233.patch
@@ -0,0 +1,42 @@
+From 589819183afc18f2d5b51dbbce68b7aca020c5e8 Mon Sep 17 00:00:00 2001
+From: bwoodsend <bwoodsend@gmail.com>
+Date: Wed, 10 Feb 2021 19:53:28 +0000
+Subject: [PATCH] Bindepend: Skip/warn unrecognised output from ldconfig
+ (#5540). [skip-ci]
+
+ldconfig has started adding additional lines of output such as:
+
+    Cache generated by: ldconfig (GNU libc) release release version 2.33
+
+which caused regex parse errors. This particular line is now whitelisted
+as skipable. And any future unrecognised patterns will now issue
+warnings.
+---
+ PyInstaller/depend/utils.py | 12 ++++++++++++
+ news/5540.bugfix.rst        |  3 +++
+ 2 files changed, 15 insertions(+)
+ create mode 100644 news/5540.bugfix.rst
+
+diff --git a/PyInstaller/depend/utils.py b/PyInstaller/depend/utils.py
+index baffb2a9f3..95846f39d5 100644
+--- a/PyInstaller/depend/utils.py
++++ b/PyInstaller/depend/utils.py
+@@ -399,6 +399,18 @@ def load_ldconfig_cache():
+     for line in text:
+         # :fixme: this assumes libary names do not contain whitespace
+         m = pattern.match(line)
++
++        # Sanitize away any abnormal lines of output.
++        if m is None:
++            # Warn about it then skip the rest of this iteration.
++            if re.search("Cache generated by:", line):
++                # See #5540. This particular line is harmless.
++                pass
++            else:
++                logger.warning(
++                    "Unrecognised line of output %r from ldconfig", line)
++            continue
++
+         path = m.groups()[-1]
+         if is_freebsd or is_openbsd:
+             # Insert `.so` at the end of the lib's basename. soname
diff --git a/python-PyInstaller.changes b/python-PyInstaller.changes
index 6b0a5b4..8a9fb7b 100644
--- a/python-PyInstaller.changes
+++ b/python-PyInstaller.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr  1 13:27:23 UTC 2021 - Markéta Machová <mmachova@suse.com>
+
+- Automagically skip matplotlib tests because matplotlib dropped python36
+- Add glibc233.patch to fix recent test failure
+
 -------------------------------------------------------------------
 Wed Mar 18 07:22:03 UTC 2020 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-PyInstaller.spec b/python-PyInstaller.spec
index 002f8ae..5c9b38f 100644
--- a/python-PyInstaller.spec
+++ b/python-PyInstaller.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-PyInstaller
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,8 @@ Summary:        Bundle a Python application and all its dependencies into a sing
 License:        GPL-2.0-only
 URL:            https://www.pyinstaller.org
 Source:         https://files.pythonhosted.org/packages/source/P/PyInstaller/PyInstaller-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM https://github.com/pyinstaller/pyinstaller/pull/5547/commits/589819183afc18f2d5b51dbbce68b7aca020c5e8 Bindepend: Skip/warn unrecognised output from ldconfig
+Patch0:         glibc233.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -47,7 +49,6 @@ BuildRequires:  %{python_module Sphinx}
 BuildRequires:  %{python_module cryptography}
 BuildRequires:  %{python_module docutils}
 BuildRequires:  %{python_module macholib >= 1.8}
-BuildRequires:  %{python_module matplotlib}
 BuildRequires:  %{python_module opengl}
 BuildRequires:  %{python_module pefile >= 2017.8.1}
 BuildRequires:  %{python_module psutil}
@@ -73,6 +74,7 @@ interpreter or any modules.
 
 %prep
 %setup -q -n PyInstaller-%{version}
+%autopatch -p1
 chmod a-x PyInstaller/utils/hooks/__init__.py
 
 # Force build of bootloader