diff --git a/qt6-qtvirtualkeyboard.spec b/qt6-qtvirtualkeyboard.spec
index 3028063..0e3275f 100644
--- a/qt6-qtvirtualkeyboard.spec
+++ b/qt6-qtvirtualkeyboard.spec
@@ -1,15 +1,30 @@
+# FIXME: qt6-qtdeclarative doesn't build on S390x
+# BUG: https://bugreports.qt.io/browse/QTBUG-93101
+ExcludeArch: s390x
+
 %global qt_module qtvirtualkeyboard
 
+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta4
+%endif
+
 Summary: Qt6 - VirtualKeyboard component
 Name:    qt6-%{qt_module}
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
 Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://qt.io
 %global majmin %(echo %{version} | cut -d. -f1-2)
+%global  qt_version %(echo %{version} | cut -d~ -f1)
+
+%if 0%{unstable}
+Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}-%{prerelease}.tar.xz
+%else
 Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+%endif
 
 ## upstreamable patches
 
@@ -58,7 +73,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 
 
 %prep
-%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1
 
 
 %build
@@ -81,8 +96,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %{_qt6_headerdir}/QtVirtualKeyboard/
 %{_qt6_libdir}/libQt6VirtualKeyboard.prl
 %{_qt6_libdir}/libQt6VirtualKeyboard.so
+%{_qt6_libdir}/cmake/Qt6/
 %{_qt6_libdir}/cmake/Qt6VirtualKeyboard/
-%{_qt6_libdir}/cmake/Qt6/FindHunspell.cmake
 %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtVirtualKeyboardTestsConfig.cmake
 %{_qt6_libdir}/cmake/Qt6BundledOpenwnn/Qt6BundledOpenwnnDependencies.cmake
 %{_qt6_libdir}/cmake/Qt6BundledPinyin/Qt6BundledPinyinDependencies.cmake
@@ -91,12 +106,16 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
 %{_qt6_archdatadir}/mkspecs/modules/qt_lib_virtualkeyboard*.pri
 %{_qt6_datadir}/modules/VirtualKeyboard.json
+%{_qt6_libdir}/metatypes/qt6*_metatypes.json
 
 %files examples
 %{_qt6_examplesdir}/
 
 
 %changelog
+* Mon Sep 13 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0~beta4-1
+- 6.2.0 - beta4
+
 * Thu Aug 12 2021 Jan Grulich <jgrulich@redhat.com> - 6.1.2-1
 - 6.1.2