diff --git a/.gitignore b/.gitignore
index c60760b..054f37a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,4 @@
 /cockpit-0.81.tar.bz2
 /cockpit-0.82.tar.bz2
 /cockpit-0.83.tar.bz2
+/cockpit-0.84.tar.bz2
diff --git a/cockpit.spec b/cockpit.spec
index b9b47b8..139591a 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,4 +1,4 @@
-%define tag 0.83
+%define tag 0.84
 %define rev 1
 #
 # This file is maintained at the following location:
@@ -11,7 +11,6 @@
 #
 # Globals that may be defined elsewhere
 #  * gitcommit xxxx
-#  * selinux 1
 #  * tag 0.71
 #
 
@@ -23,21 +22,9 @@
 %define branding default
 %endif
 
-#Defaults for our SELinux policy toggle
-%if %{undefined selinux}
-%if %{defined gitcommit}
-%define selinux 1
-%endif
-%if 0%{?fedora} > 0 && 0%{?fedora} <= 21
-%define selinux 1
-%endif
-%if 0%{?rhel}
-%define selinux 1
-%endif
 %if 0%{?centos}
 %define rhel 0
 %endif
-%endif
 
 %define _hardened_build 1
 
@@ -94,14 +81,6 @@ BuildRequires: nodejs
 BuildRequires: krb5-server
 %endif
 
-# For selinux
-%if 0%{?selinux}
-BuildRequires: selinux-policy-devel
-BuildRequires: checkpolicy
-BuildRequires: selinux-policy-doc
-BuildRequires: sed
-%endif
-
 # For documentation
 BuildRequires: xmlto
 
@@ -153,6 +132,7 @@ Requires: glib-networking
 Requires: openssl
 Requires: glib2 >= 2.37.4
 Requires: libssh >= %{libssh_version}
+Obsoletes: cockpit-selinux-policy <= 0.83
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -162,22 +142,16 @@ The Cockpit Web Service listens on the network, and authenticates users.
 
 %prep
 %setup -q
-%if 0%{?fedora} == 20
-	sed -i s/unconfined_service_t/unconfined_t/g src/ws/test-server.service.in
-%endif
 
 %build
 %if %{defined gitcommit}
 env NOCONFIGURE=1 ./autogen.sh
 %endif
-%configure --disable-static --disable-silent-rules --with-cockpit-user=cockpit-ws --with-branding=%{branding}
-make -j %{?extra_flags} all
-%if 0%{?selinux}
-make selinux
-%endif
+%configure --disable-static --disable-silent-rules --with-cockpit-user=cockpit-ws --with-branding=%{branding} --with-selinux-config-type=etc_t
+make -j4 %{?extra_flags} all
 
 %check
-make -j check
+make -j4 check
 
 %install
 make install DESTDIR=%{buildroot}
@@ -192,10 +166,6 @@ 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
 install -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/%{name}/
-%if 0%{?selinux}
-install -d %{buildroot}%{_datadir}/selinux/targeted
-install -p -m 644 cockpit.pp %{buildroot}%{_datadir}/selinux/targeted/
-%endif
 
 # Build the package lists for resource packages
 echo '%dir %{_datadir}/%{name}/base1' > shell.list
@@ -275,6 +245,7 @@ cat subscriptions.list docker.list networkmanager.list >> shell.list
 %{_datadir}/appdata
 %{_datadir}/applications
 %{_datadir}/pixmaps
+%doc %{_mandir}/man1/cockpit.1.gz
 
 %files bridge
 %doc %{_mandir}/man1/cockpit-bridge.1.gz
@@ -442,46 +413,16 @@ pulls in some necessary packages via dependencies.
 %{_datadir}/polkit-1/rules.d
 %{_unitdir}/cockpit-testing.service
 %{_unitdir}/cockpit-testing.socket
-%{_unitdir}/test-server.service
-%{_unitdir}/test-server.socket
-
-%endif
-
-%if 0%{?selinux}
-
-%package selinux-policy
-Summary: SELinux policy for Cockpit testing
-Requires: %{name} = %{version}-%{release}
-Requires: selinux-policy
-Requires: selinux-policy-targeted
-Requires(post): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
-Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
-BuildArch: noarch
-
-%description selinux-policy
-SELinux policy for Cockpit testing.
-
-%files selinux-policy
-%defattr(-,root,root,0755)
-%{_datadir}/selinux/targeted/cockpit.pp
-
-%post selinux-policy
-/usr/sbin/semodule -s targeted -i %{_datadir}/selinux/targeted/cockpit.pp
-/sbin/fixfiles -R cockpit restore || :
-/sbin/fixfiles -R cockpit-test-assets restore || :
-/sbin/restorecon -R %{_localstatedir}/lib/%{name}
-
-%postun selinux-policy
-if [ $1 -eq 0 ] ; then
-  /usr/sbin/semodule -s targeted -r cockpit &> /dev/null || :
-  /sbin/fixfiles -R cockpit-selinux-policy restore || :
-  [ -d %{_localstatedir}/lib/%{name} ]  && \
-    /sbin/restorecon -R %{_localstatedir}/lib/%{name} &> /dev/null || :
-fi
 
 %endif
 
 %changelog
+* Wed Nov 18 2015 Stef Walter <stefw@redhat.com> - 0.84-1
+- * Add a cockpit manual page
+- * Set correct SELinux context for certificates
+- * Remove custom SELinux policy
+- * Testing and bug fixes
+
 * Tue Nov 03 2015 Stef Walter <stefw@redhat.com> - 0.83-1
 - * Fix NTP server configuration bugs
 - * Kubernetes dashboard topology icons don't leave the view
diff --git a/sources b/sources
index 1ccf101..1a612f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-92c9677514a123c2be3bd733a45f9383  cockpit-0.83.tar.bz2
+6b11bed0c78b1bfce07cae63015254a6  cockpit-0.84.tar.bz2