diff --git a/.gitignore b/.gitignore
index edffff4..2e5e086 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,4 @@
 /cockpit-132.tar.xz
 /cockpit-133.tar.xz
 /cockpit-135.tar.xz
+/cockpit-137.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index 3ab72cd..ad896ec 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:	135
+Version:	137
 Release: 1%{?dist}
 #
 # This file is maintained at the following location:
@@ -79,13 +79,11 @@ BuildRequires: xmlto
 
 Requires: %{name}-bridge = %{version}-%{release}
 Requires: %{name}-ws = %{version}-%{release}
-%if %{defined build_dashboard}
-Requires: %{name}-dashboard = %{version}-%{release}
-%endif
 Requires: %{name}-system = %{version}-%{release}
 
 # Optional components (for f24 we use soft deps)
 %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
+Recommends: %{name}-dashboard = %{version}-%{release}
 Recommends: %{name}-networkmanager = %{version}-%{release}
 Recommends: %{name}-storaged = %{version}-%{release}
 %ifarch x86_64 %{arm} aarch64 ppc64le
@@ -95,14 +93,6 @@ Suggests: %{name}-pcp = %{version}-%{release}
 Suggests: %{name}-kubernetes = %{version}-%{release}
 Suggests: %{name}-selinux = %{version}-%{release}
 
-# Older releases need to have strict requirements
-%else
-Requires: %{name}-networkmanager = %{version}-%{release}
-Requires: %{name}-storaged = %{version}-%{release}
-%ifarch x86_64 armv7hl
-Requires: %{name}-docker = %{version}-%{release}
-%endif
-
 %endif
 
 %description
@@ -155,7 +145,7 @@ install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/%{name}/
 
 # On RHEL we don't yet show options for changing language
 %if 0%{?rhel}
-echo '{ "linguas": null, "machine-limit": 5 }' > %{buildroot}%{_datadir}/%{name}/shell/override.json
+echo '{ "linguas": null }' > %{buildroot}%{_datadir}/%{name}/shell/override.json
 %endif
 
 # Build the package lists for resource packages
@@ -228,7 +218,7 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/docker
 touch docker.list
 %endif
 
-%ifarch x86_64 ppc64le
+%ifarch aarch64 x86_64 ppc64le s390x
 %if %{defined wip}
 %else
 rm %{buildroot}/%{_datadir}/%{name}/kubernetes/override.json
@@ -237,6 +227,8 @@ echo '%dir %{_datadir}/%{name}/kubernetes' > kubernetes.list
 find %{buildroot}%{_datadir}/%{name}/kubernetes -type f >> kubernetes.list
 %else
 rm -rf %{buildroot}/%{_datadir}/%{name}/kubernetes
+rm -f %{buildroot}/%{_libexecdir}/cockpit-kube-auth
+rm -f %{buildroot}/%{_libexecdir}/cockpit-kube-launch
 rm %{buildroot}/%{_libexecdir}/cockpit-stub
 touch kubernetes.list
 %endif
@@ -352,6 +344,9 @@ Cockpit support for reading PCP metrics and loading PCP archives.
 Summary: Cockpit SSH remoting and dashboard
 Requires: libssh >= %{libssh_version}
 Provides: %{name}-ssh
+# nothing depends on the dashboard, but we can't use it with older versions of the bridge
+Conflicts: %{name}-bridge < 135
+Conflicts: %{name}-ws < 135
 
 %description dashboard
 Cockpit support for remoting to other servers, bastion hosts, and a basic dashboard
@@ -405,8 +400,9 @@ Requires: NetworkManager
 Provides: %{name}-kdump = %{version}-%{release}
 Requires: kexec-tools
 # Optional components (only when soft deps are supported)
-%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
+%if 0%{?rhel} >= 8
 Recommends: NetworkManager-team
+Recommends: setroubleshoot-server >= 3.3.3
 %endif
 Provides: %{name}-selinux = %{version}-%{release}
 Provides: %{name}-sosreport = %{version}-%{release}
@@ -549,7 +545,9 @@ The Cockpit component for managing networking.  This package uses NetworkManager
 Summary: Cockpit SELinux package
 Requires: %{name}-bridge >= 122
 Requires: %{name}-shell >= 122
-Requires: setroubleshoot-server >= 3.3.3
+%if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
+Recommends: setroubleshoot-server >= 3.3.3
+%endif
 BuildArch: noarch
 
 %description selinux
@@ -577,7 +575,7 @@ This package is not yet complete.
 
 %endif
 
-%ifarch x86_64 ppc64le
+%ifarch aarch64 x86_64 ppc64le s390x
 
 %package kubernetes
 Summary: Cockpit user interface for Kubernetes cluster
@@ -601,6 +599,14 @@ cluster. Installed on the Kubernetes master. This package is not yet complete.
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu Mar 30 2017 Martin Pitt <<mpitt@redhat.com>> - 137-1
+
+- Read ~/.ssh/known_hosts for connecting to remote machines with ssh
+- The Storage LVM setup can add unpartitioned free space as a physical volume
+- NetworkManager's Team plugin can be used on architectures other than x86_64
+- Cockpit's web server understands and properly responds to HTTP HEAD requests
+- Allow parameter substitution in manifest when spawning peer bridges
+
 * Wed Mar 15 2017 Stef Walter <<stefw@redhat.com>> - 135-1
 - It is now possible to use file descriptors passed over the DBus API
 - Add "Disks" tab to Virtual Machines
diff --git a/sources b/sources
index 8020b65..1ce09e0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-135.tar.xz) = cf1a3b643a89a197d3d45ee474f4d8e978cee950268b17f4b2e481671840c47b1f2ae1d42a1eb92b1fff022b0dc46213d13d3722bb639560a6c2e7553afaf62b
+SHA512 (cockpit-137.tar.xz) = 92d1061266063cba6ec6d93de8bac035f1a5d2b777207e5c864bba4b2f2f4e1b47de23a30affb23624398bd72d2944dee550293895b2c3d991df71ffb616db54