diff --git a/.gitignore b/.gitignore
index 9d7dbb9..350d559 100644
--- a/.gitignore
+++ b/.gitignore
@@ -175,3 +175,4 @@
 /cockpit-215.tar.xz
 /cockpit-216.tar.xz
 /cockpit-217.tar.xz
+/cockpit-218.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index 90295df..012c0e1 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        217
+Version:        218
 Release: 1%{?dist}
 #
 # This file is maintained at the following location:
@@ -78,7 +78,7 @@ BuildRequires: autoconf automake
 BuildRequires: /usr/bin/python3
 BuildRequires: gettext >= 0.19.7
 %if %{defined build_dashboard}
-BuildRequires: libssh-devel >= 0.8
+BuildRequires: libssh-devel >= 0.8.5
 %endif
 BuildRequires: openssl-devel
 BuildRequires: gnutls-devel >= 3.4.3
@@ -160,7 +160,13 @@ make -j4 %{?extra_flags} all
 
 %check
 exec 2>&1
-make -j4 check
+# HACK: Fedora koji builders are very slow, unreliable, and inaccessible for debugging; https://github.com/cockpit-project/cockpit/issues/13909
+%if 0%{?fedora} >= 0
+%ifarch s390x
+%define testsuite_fail || true
+%endif
+%endif
+make -j4 check %{?testsuite_fail}
 
 %install
 make install DESTDIR=%{buildroot}
@@ -715,6 +721,13 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Apr 29 2020 Martin Pitt <mpitt@redhat.com> - 218-1
+
+- Services: Improved accessibility and mobile support
+- Overview: Add uptime information
+- Disable idle timeout by default
+- Support building without polkit
+
 * Wed Apr 15 2020 Marius Vollmer <mvollmer@redhat.com> - 217-1
 
 - verview: more Insights details
diff --git a/sources b/sources
index 88ebbb7..c93bacf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-217.tar.xz) = 8dc17f144e91a69a00c5c169ac32084585bf2594b07d04e8aa096c1057629676c613bd0038803b8ee4ef6ac868f221839b5d6e24f27e4d05b2c23293e4f76710
+SHA512 (cockpit-218.tar.xz) = 6d3db1c3368d3d73757042f79c89bcf2c5ec6b5f941f4a7e83507a775c43cf78f86dae7bb04adea1fea7d09844e3f076d10eb6822e7c5417b0c391303a16ef06