diff --git a/.gitignore b/.gitignore
index cd3d8bc..c4fc9d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /kwayland-5.6.4.tar.xz
+/kwayland-5.22.0.tar.xz
diff --git a/kf5-kwayland.spec b/kf5-kwayland.spec
index 834a8ce..dcb54f3 100644
--- a/kf5-kwayland.spec
+++ b/kf5-kwayland.spec
@@ -2,8 +2,16 @@
 
 %global  wayland_min_version 1.3
 
+## uncomment to enable bootstrap mode
+#global bootstrap 1
+
+## currently includes no tests
+%if !0%{?bootstrap}
+%global tests 1
+%endif
+
 Name:    kf5-%{framework}
-Version: 5.6.4
+Version: 5.22.0
 Release: 1%{?dist}
 Summary: KDE Frameworks 5 library that wraps Client and Server Wayland libraries
 
@@ -16,9 +24,9 @@ URL:     https://quickgit.kde.org/?p=%{framework}.git
 %else
 %global stable stable
 %endif
-Source0:        http://download.kde.org/%{stable}/plasma/%{version}/kwayland-%{version}.tar.xz
+Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework}-%{version}.tar.xz
 
-BuildRequires:  extra-cmake-modules
+BuildRequires:  extra-cmake-modules >= %{version}
 BuildRequires:  kf5-rpm-macros
 BuildRequires:  libwayland-client-devel >= %{wayland_min_version}
 BuildRequires:  libwayland-cursor-devel >= %{wayland_min_version}
@@ -26,6 +34,13 @@ BuildRequires:  libwayland-server-devel >= %{wayland_min_version}
 BuildRequires:  mesa-libwayland-egl-devel
 BuildRequires:  qt5-qtbase-devel
 BuildRequires:  wayland-devel >= %{wayland_min_version}
+%if 0%{?tests}
+BuildRequires: dbus-x11
+BuildRequires: time
+BuildRequires: weston
+BuildRequires: xorg-x11-server-Xvfb
+%endif
+
 
 Requires:       kf5-filesystem
 
@@ -47,7 +62,8 @@ developing applications that use %{name}.
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kf5} ..
+%{cmake_kf5} .. \
+  -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -57,14 +73,24 @@ make %{?_smp_mflags} -C %{_target_platform}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
+%check
+%if 0%{?tests}
+export CTEST_OUTPUT_ON_FAILURE=1
+xvfb-run -a \
+dbus-launch --exit-with-session \
+time \
+make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||:
+%endif
+
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %license COPYING.LIB
 %{_sysconfdir}/xdg/org_kde_kwayland.categories
-%{_kf5_libdir}/libKF5WaylandClient.so.*
-%{_kf5_libdir}/libKF5WaylandServer.so.*
+%{_kf5_libdir}/libKF5WaylandClient.so.5*
+%{_kf5_libdir}/libKF5WaylandServer.so.5*
 
 %files devel
 %{_kf5_includedir}/KWayland/
@@ -77,6 +103,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Tue May 17 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.22.0-1
+- kf5-5.22 release, support bootstrap, add %%check
+
 * Sat May 14 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.4-1
 - 5.6.4
 
diff --git a/sources b/sources
index a2a1e01..51fa86e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb9f146778e5bc3f238cc7ce8262d73a  kwayland-5.6.4.tar.xz
+5ced8f7f6c75116297c99c83817022ca  kwayland-5.22.0.tar.xz