diff --git a/poppler.spec b/poppler.spec
index 987d30b..a3c5d9b 100644
--- a/poppler.spec
+++ b/poppler.spec
@@ -1,6 +1,13 @@
 %global test_sha 03a4b9eb854a06a83c465e82de601796c458bbe9
 %global test_date 2021-01-11
 
+# Enable qt6 support (or not)
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+%ifnarch s390x
+%global qt6 1
+%endif
+
 Summary: PDF rendering library
 Name:    poppler
 Version: 22.01.0
@@ -29,7 +36,7 @@ BuildRequires: pkgconfig(freetype2)
 BuildRequires: pkgconfig(gdk-pixbuf-2.0)
 BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(gobject-2.0)
-BuildRequires: pkgconfig(gobject-introspection-1.0) 
+BuildRequires: pkgconfig(gobject-introspection-1.0)
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(gtk-doc)
 BuildRequires: pkgconfig(lcms2)
@@ -44,9 +51,7 @@ BuildRequires: pkgconfig(Qt5Gui)
 BuildRequires: pkgconfig(Qt5Test)
 BuildRequires: pkgconfig(Qt5Widgets)
 BuildRequires: pkgconfig(Qt5Xml)
-# FIXME: qt6-qtdeclarative doesn't build on S390x
-# BUG: https://bugreports.qt.io/browse/QTBUG-93101
-%ifnarch s390x
+%if 0%{?qt6}
 BuildRequires: cmake(Qt6Core)
 BuildRequires: cmake(Qt6Gui)
 BuildRequires: cmake(Qt6Test)
@@ -109,7 +114,7 @@ Obsoletes: %{name}-qt-devel < 0.90.0-9
 %description qt5-devel
 %{summary}.
 
-%ifnarch s390x
+%if 0%{?qt6}
 %package qt6
 Summary: Qt6 wrapper for poppler
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -175,7 +180,7 @@ test "$(pkg-config --modversion poppler)" = "%{version}"
 test "$(pkg-config --modversion poppler-cpp)" = "%{version}"
 test "$(pkg-config --modversion poppler-glib)" = "%{version}"
 test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
-%ifnarch s390x
+%if 0%{?qt6}
 test "$(pkg-config --modversion poppler-qt6)" = "%{version}"
 %endif
 
@@ -185,7 +190,7 @@ test "$(pkg-config --modversion poppler-qt6)" = "%{version}"
 
 %ldconfig_scriptlets qt5
 
-%ifnarch s390x
+%if 0%{?qt6}
 %ldconfig_scriptlets qt6
 %endif
 
@@ -228,7 +233,7 @@ test "$(pkg-config --modversion poppler-qt6)" = "%{version}"
 %{_libdir}/pkgconfig/poppler-qt5.pc
 %{_includedir}/poppler/qt5/
 
-%ifnarch s390x
+%if 0%{?qt6}
 %files qt6
 %{_libdir}/libpoppler-qt6.so.3*