diff --git a/.gitignore b/.gitignore
index e60f52c..6f7833c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,3 +132,4 @@
 /cockpit-170.tar.xz
 /cockpit-171.tar.xz
 /cockpit-173.tar.xz
+/cockpit-174.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index 53d83a5..2f7dd54 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,6 +1,6 @@
 # This spec file has been automatically updated
-Version:	173
-Release: 3%{?dist}
+Version:	174
+Release: 1%{?dist}
 #
 # This file is maintained at the following location:
 # https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec
@@ -39,6 +39,13 @@ Release: 3%{?dist}
 # build optional extensions like cockpit-docker
 %define build_optional 1
 
+# cockpit's firewall service definition moved to firewalld
+%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
+%define firewalld_service 0
+%else
+%define firewalld_service 1
+%endif
+
 %define __lib lib
 
 # on RHEL 7.x we build subscriptions; superseded later by
@@ -158,7 +165,9 @@ exec 2>&1
     --disable-silent-rules \
     --with-cockpit-user=cockpit-ws \
     --with-selinux-config-type=etc_t \
-    %{?rhel:--without-storaged-iscsi-sessions} \
+%if 0%{?rhel} >= 7 && 0%{?rhel} < 8
+    --without-storaged-iscsi-sessions \
+%endif
     --with-appstream-data-packages='[ "appstream-data" ]' \
     --with-nfs-client-package='"nfs-utils"' \
     %{?vdo_on_demand:--with-vdo-package='"vdo"'}
@@ -174,7 +183,9 @@ make install-tests DESTDIR=%{buildroot}
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 644 tools/cockpit.pam $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/cockpit
 rm -f %{buildroot}/%{_libdir}/cockpit/*.so
+%if 0%{?firewalld_service} == 0
 rm -f %{buildroot}/%{_prefix}/%{__lib}/firewalld/services/cockpit.xml
+%endif
 install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
 
 # On RHEL we don't yet show options for changing language
@@ -466,7 +477,11 @@ Summary: Cockpit Web Service
 Requires: glib-networking
 Requires: openssl
 Requires: glib2 >= 2.37.4
+%if 0%{?firewalld_service}
+Conflicts: firewalld >= 0.6.0-1
+%else
 Conflicts: firewalld < 0.6.0-1
+%endif
 %if 0%{?fedora} >= 24 || 0%{?rhel} >= 8
 Recommends: sscg >= 2.3
 %endif
@@ -491,6 +506,9 @@ The Cockpit Web Service listens on the network, and authenticates users.
 %{_unitdir}/cockpit.service
 %{_unitdir}/cockpit-motd.service
 %{_unitdir}/cockpit.socket
+%if 0%{?firewalld_service}
+%{_prefix}/%{__lib}/firewalld/services/cockpit.xml
+%endif
 %{_prefix}/%{__lib}/tmpfiles.d/cockpit-tempfiles.conf
 %{_sbindir}/remotectl
 %{_libdir}/security/pam_ssh_add.so
@@ -815,6 +833,11 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Aug 01 2018 Marius Vollmer <mvollmer@redhat.com> - 174-1
+
+- Kubernetes: VM detail page
+- Realmd: Install on demand
+
 * Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 173-3
 - Rebuild with fixed binutils
 
diff --git a/sources b/sources
index f4f8565..e9935f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-173.tar.xz) = 07e59f187d7431f6e3e232d07593cca7d061745394b946927ce819e2de77dc70ed0cf78887ce06920a36d3c1b8650c950049028c913f22464921d6650d01a3e5
+SHA512 (cockpit-174.tar.xz) = 5d072804e915be209829dee2ab4629b3d7e141959892c8cb2abcb1d3e19e6c30011362cddb332dac48f15bcf999247717dbc0b388a92187bfe1aec711ef98454