diff --git a/.gitignore b/.gitignore
index 1050ccb..67171ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,3 +130,4 @@
 /cockpit-167.tar.xz
 /cockpit-168.tar.xz
 /cockpit-170.tar.xz
+/cockpit-171.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index a5f9252..2a04f0f 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:	170
+Version:	171
 Release: 1%{?dist}
 #
 # This file is maintained at the following location:
@@ -77,6 +77,10 @@ BuildRequires: pkgconfig(polkit-agent-1) >= 0.105
 BuildRequires: pam-devel
 
 BuildRequires: autoconf automake
+%if 0%{?fedora} || 0%{?rhel} >= 8
+BuildRequires: /usr/bin/python3
+%endif
+# FIXME: tools/ is not completely ported to Python 3 yet
 BuildRequires: /usr/bin/python2
 BuildRequires: intltool
 %if %{defined build_dashboard}
@@ -109,7 +113,9 @@ Requires: cockpit-system = %{version}-%{release}
 
 # Optional components (for f24 we use soft deps)
 %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
+%if 0%{?rhel} == 0
 Recommends: cockpit-dashboard = %{version}-%{release}
+%endif
 Recommends: (cockpit-networkmanager = %{version}-%{release} if NetworkManager)
 Recommends: (cockpit-storaged = %{version}-%{release} if udisks2)
 Recommends: (cockpit-packagekit = %{version}-%{release} if PackageKit)
@@ -150,8 +156,7 @@ exec 2>&1
     --with-selinux-config-type=etc_t \
     %{?rhel:--without-storaged-iscsi-sessions} \
     --with-appstream-data-packages='[ "appstream-data" ]' \
-    --with-nfs-client-package='"nfs-utils"' \
-    %{!?build_dashboard:--disable-ssh}
+    --with-nfs-client-package='"nfs-utils"'
 make -j4 %{?extra_flags} all
 
 %check
@@ -175,14 +180,20 @@ echo '{ "linguas": null }' > %{buildroot}%{_datadir}/cockpit/shell/override.json
 echo '%dir %{_datadir}/cockpit/base1' > base.list
 find %{buildroot}%{_datadir}/cockpit/base1 -type f >> base.list
 echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
+# RHEL 7 needs to keep cockpit-ssh in dashboard for backwards compat
+%if 0%{?rhel} == 7 || 0%{?centos} == 7
+find %{buildroot}%{_datadir}/cockpit/ssh -type f >> dashboard.list
+echo '%{_libexecdir}/cockpit-ssh' >> dashboard.list
+%else
+find %{buildroot}%{_datadir}/cockpit/ssh -type f >> base.list
+echo '%{_libexecdir}/cockpit-ssh' >> base.list
+%endif
 
 %if %{defined build_dashboard}
 echo '%dir %{_datadir}/cockpit/dashboard' >> dashboard.list
 find %{buildroot}%{_datadir}/cockpit/dashboard -type f >> dashboard.list
-find %{buildroot}%{_datadir}/cockpit/ssh -type f >> dashboard.list
 %else
 rm -rf %{buildroot}/%{_datadir}/cockpit/dashboard
-rm -rf %{buildroot}/%{_datadir}/cockpit/ssh
 touch dashboard.list
 %endif
 
@@ -271,7 +282,7 @@ touch kubernetes.list
 
 # when not building basic packages, remove their files
 %if 0%{?build_basic} == 0
-for pkg in base1 branding motd kdump networkmanager realmd selinux shell sosreport static storaged systemd tuned users; do
+for pkg in base1 branding motd kdump networkmanager realmd selinux shell sosreport ssh static storaged systemd tuned users; do
     rm -r %{buildroot}/%{_datadir}/cockpit/$pkg
 done
 for data in applications doc locale man metainfo pixmaps; do
@@ -285,11 +296,12 @@ for libexec in cockpit-askpass cockpit-session cockpit-ws; do
 done
 rm -r %{buildroot}/%{_libdir}/security %{buildroot}/%{_sysconfdir}/pam.d %{buildroot}/%{_sysconfdir}/motd.d %{buildroot}/%{_sysconfdir}/issue.d
 rm %{buildroot}/usr/bin/cockpit-bridge %{buildroot}/usr/sbin/remotectl
+rm -f %{buildroot}%{_libexecdir}/cockpit-ssh
 %endif
 
 # when not building optional packages, remove their files
 %if 0%{?build_optional} == 0
-for pkg in apps dashboard docker kubernetes machines ostree ovirt packagekit pcp playground ssh; do
+for pkg in apps dashboard docker kubernetes machines ostree ovirt packagekit pcp playground; do
     rm -rf %{buildroot}/%{_datadir}/cockpit/$pkg
 done
 # files from -tests
@@ -298,8 +310,6 @@ rm -r %{buildroot}/%{_prefix}/%{__lib}/cockpit-test-assets %{buildroot}/%{_sysco
 rm -r %{buildroot}/%{_libexecdir}/cockpit-pcp %{buildroot}/%{_localstatedir}/lib/pcp/
 # files from -kubernetes
 rm -f %{buildroot}/%{_libexecdir}/cockpit-kube-auth %{buildroot}/%{_libexecdir}/cockpit-kube-launch %{buildroot}/%{_libexecdir}/cockpit-stub
-# files from -dashboard
-rm -f %{buildroot}%{_libexecdir}/cockpit-ssh
 %endif
 
 sed -i "s|%{buildroot}||" *.list
@@ -348,10 +358,6 @@ rm -f %{buildroot}/usr/share/pixmaps/cockpit-sosreport.png
 Cockpit runs in a browser and can manage your network of GNU/Linux
 machines.
 
-%if 0%{?rhel} >= 8
-%enable_gotoolset7
-%endif
-
 %files
 %{_docdir}/cockpit/AUTHORS
 %{_docdir}/cockpit/COPYING
@@ -366,6 +372,12 @@ machines.
 %package bridge
 Summary: Cockpit bridge server-side component
 Requires: glib-networking
+%if 0%{?rhel} != 7 && 0%{?centos} != 7
+Requires: libssh >= %{libssh_version}
+Provides: cockpit-ssh = %{version}-%{release}
+# cockpit-ssh moved from dashboard to bridge in 171
+Conflicts: cockpit-dashboard < 170.x
+%endif
 
 %description bridge
 The Cockpit bridge component installed server side and runs commands on the
@@ -699,10 +711,15 @@ Cockpit support for reading PCP metrics and loading PCP archives.
 %if %{defined build_dashboard}
 %package -n cockpit-dashboard
 Summary: Cockpit remote servers and dashboard
+%if 0%{?rhel} == 7 || 0%{?centos} == 7
 Requires: libssh >= %{libssh_version}
 Provides: cockpit-ssh = %{version}-%{release}
 # nothing depends on the dashboard, but we can't use it with older versions of the bridge
 Conflicts: cockpit-bridge < 135
+%else
+BuildArch: noarch
+Requires: cockpit-ssh >= 135
+%endif
 Conflicts: cockpit-ws < 135
 
 %description -n cockpit-dashboard
@@ -710,7 +727,6 @@ Cockpit support for connecting to remote servers (through ssh),
 bastion hosts, and a basic dashboard.
 
 %files -n cockpit-dashboard -f dashboard.list
-%{_libexecdir}/cockpit-ssh
 
 %endif
 
@@ -752,6 +768,10 @@ Provides: cockpit-stub = %{version}-%{release}
 The Cockpit components for visualizing and configuring a Kubernetes
 cluster. Installed on the Kubernetes master. This package is not yet complete.
 
+%if 0%{?rhel} >= 8
+%enable_gotoolset7
+%endif
+
 %files -n cockpit-kubernetes -f kubernetes.list
 %{_libexecdir}/cockpit-kube-auth
 %{_libexecdir}/cockpit-kube-launch
@@ -774,6 +794,16 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Jun 27 2018 Martin Pitt <martin@piware.de> - 171-1
+
+- Machines: Add virtual CPU configuration
+- Kubernetes: Add KubeVirt pod metrics
+- Docker: Show container volumes
+- Fix broken actions for non-administrators
+- Networking: Handle non-running NetworkManager
+- Accounts: User role improvements
+- Localize times
+
 * Wed Jun 13 2018 Martin Pitt <martin@piware.de> - 170-1
 
 - Software Updates: Layout rework
diff --git a/sources b/sources
index 5f5b581..425bc8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-170.tar.xz) = 618e45529301d8e69f15cddcbfd7e5f3702d86561248fe837416c9364bab7a91ed27361c0e2d173b3993cbb4561b4bb2eeba39c6e861027805260be6394a568a
+SHA512 (cockpit-171.tar.xz) = eeefffeaf070d356571d6503a96fc552fe63edee4d325f4ac0dfce32e12147696cb67f42d4f2cb94437f6d66a6adf74a908b24ad46dfae0453cdbce5712bc1df