diff --git a/macros.qt5 b/macros.qt5
index 6e19a61..16cb15c 100644
--- a/macros.qt5
+++ b/macros.qt5
@@ -43,7 +43,7 @@
   do                                                                                   \
       mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE"                                  \
   done                                                                                 \
-  find ./tests -not -path '*/\.*'                                                      \\\
+  find ./tests -not -path '*/\.*'                                                       \\\
                -not -name '*.h'                                                        \\\
                -not -name '*.cpp'                                                      \\\
                -not -name '*.pro'                                                      \\\
@@ -52,10 +52,12 @@
                -not -name 'Makefile'                                                   \\\
                -type f | while read LINE                                               \
   do                                                                                   \
-      if grep --quiet "#\\!\\ */usr/bin/env\\ python\\|#\\!/usr/bin/python$" "$LINE"   \
+      if grep --quiet "#\\!\\ */usr/bin/env\\ python[23]\\{1\\}\\|#\\!\\ */usr/bin/env\\ python$\\|#\\!/usr/bin/python$" "$LINE" \
       then                                                                             \
           sed -i s@\\/usr\\/bin\\/python\\$@\\/usr\\/bin\\/python3@ "$LINE"            \
-          sed -i s@\\/usr\\/bin\\/env\\ python@\\/usr\\/bin\\/python3@ "$LINE"         \
+          sed -i s@\\/usr\\/bin\\/env\\ python2\\$@\\/usr\\/bin\\/python2@ "$LINE"     \
+          sed -i s@\\/usr\\/bin\\/env\\ python3\\$@\\/usr\\/bin\\/python3@ "$LINE"     \
+          sed -i s@\\/usr\\/bin\\/env\\ python\\$@\\/usr\\/bin\\/python3@ "$LINE"      \
       fi                                                                               \
       cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/                          \
   done                                                                                 \
diff --git a/qt5.spec b/qt5.spec
index 8f09082..e4790d3 100644
--- a/qt5.spec
+++ b/qt5.spec
@@ -6,7 +6,7 @@
 
 Name: qt5
 Version: 5.15.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Qt5 meta package
 License: GPLv3
 URL: https://getfedora.org/
@@ -141,6 +141,10 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README
 
 
 %changelog
+* Tue Jun 15 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-8
+- Use more robust regular expressions
+  Resolves: bz#1969433
+
 * Fri Jun 11 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-7
 - Use more precise regular expression for python shebangs
   Resolves: bz#1969433