diff --git a/qt5-qtquickcontrols2.spec b/qt5-qtquickcontrols2.spec
index bd69cf0..2ef515b 100644
--- a/qt5-qtquickcontrols2.spec
+++ b/qt5-qtquickcontrols2.spec
@@ -3,7 +3,7 @@
 Name:    qt5-%{qt_module}
 Summary: Qt5 - module with set of QtQuick controls for embedded
 Version: 5.15.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2+ or LGPLv3 and GFDL
 Url:     http://www.qt.io
@@ -14,7 +14,8 @@ Patch1:  0001-Unset-mouseGrabberPopup-if-it-s-removed-from-childre.patch
 Patch2:  0002-Ensure-we-don-t-crash-when-changing-sizes-after-clea.patch
 Patch3:  0003-QQuickAction-don-t-grab-the-same-shortcut-multiple-t.patch
 Patch4:  0004-QQuickAbstractButton-fix-crash-on-destruction.patch
-Patch5:  0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch
+# The following patch breaks compilation. To be fixed
+#Patch5:  0005-Revert-Allow-creation-of-custom-QQuickPopupItem-deri.patch
 Patch6:  0006-Fix-scroll-bars-not-showing-up-when-binding-to-stand.patch
 
 
@@ -58,8 +59,7 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{qt_module}-everywhere-src-%{version}
-
+%autosetup -p1 -n %{qt_module}-everywhere-src-%{version}
 
 %build
 %{qmake_qt5}
@@ -112,6 +112,11 @@ rm -f %{buildroot}%{_qt5_libdir}/libQt5*.la
 %{_libdir}/cmake/Qt5QuickTemplates2/
 
 %changelog
+* Mon Sep 12 2022 Marc Deop marcdeop@fedoraproject.org - 5.15.5-4
+- Use autosetup macro instead of setup
+- Due to using autosetup, previous patches are now applied
+- Comment out problematic patch
+
 * Wed Aug 24 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.5-3
 - Backport fixes from Qt patch collection