diff --git a/cockpit.spec b/cockpit.spec
index a84c780..8e9ef49 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 Name:           cockpit
-Version:        0.15
+Version:        0.16
 Release:        1%{?dist}
 Summary:        A user interface for Linux servers
 
@@ -73,7 +73,7 @@ This package contains the web assets used by Cockpit.
 rm -rf src/libgsystem/*.{c,doap}
 
 %build
-%configure --disable-static --disable-silent-rules
+%configure --disable-static --disable-silent-rules --with-cockpit-user=cockpit-ws
 make %{?_smp_mflags}
 
 %check
@@ -104,22 +104,28 @@ rm -rf %{buildroot}%{_datadir}/cockpit-test-assets
 %{_unitdir}/cockpit.socket
 %{_prefix}/lib/firewalld/services/cockpit.xml
 %{_datadir}/dbus-1/services/com.redhat.Cockpit.service
+%{_sbindir}/remotectl
 %{_libexecdir}/cockpitd
 %{_libexecdir}/cockpit-ws
-%{_libexecdir}/cockpit-session
 %{_libexecdir}/cockpit-agent
 # HACK: We need to do attr because stripping debuginfo removes setuid
 # https://bugzilla.redhat.com/show_bug.cgi?id=117858
 %attr(4755, -, -) %{_libexecdir}/cockpit-polkit
+%attr(4750, root, cockpit-ws) %{_libexecdir}/cockpit-session
 %{_libdir}/security/pam_reauthorize.so
-%{_sharedstatedir}/%{name}
+%attr(775, -, wheel) %{_sharedstatedir}/%{name}
 
 %files assets
 %{_datadir}/%{name}
 
+%pre
+getent group cockpit-ws >/dev/null || groupadd -r cockpit-ws
+getent group cockpit-user-admin >/dev/null || groupadd -r cockpit-user-admin
+getent group cockpit-realm-admin >/dev/null || groupadd -r cockpit-realm-admin
+getent group cockpit-storage-admin >/dev/null || groupadd -r cockpit-storage-admin
+getent passwd cockpit-ws >/dev/null || useradd -r -g cockpit-ws -d / -s /sbin/nologin -c "User for cockpit-ws" cockpit-ws
+
 %post
-chgrp wheel %{_sharedstatedir}/%{name}
-chmod 775 %{_sharedstatedir}/%{name}
 %systemd_post cockpit.service
 # firewalld only partially picks up changes to its services files without this
 test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
@@ -132,6 +138,9 @@ test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
 
 
 %changelog
+* Thu Jul 17 2014 Stef Walter <stefw@redhat.com> 0.16-1
+- Update to 0.16 release
+
 * Thu Jul 10 2014 Stef Walter <stefw@redhat.com> 0.15-1
 - Update to 0.15 release
 - Put pam_reauthorize.so in the cockpit PAM stack
diff --git a/sources b/sources
index bd39b1e..5c58913 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da431648ba68145bbe63afa8652d3be8  cockpit-0.15.tar.bz2
+dd20566b76b62b6bd08ab4ea9a1c0669  cockpit-0.16.tar.bz2