diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index 72c613e..3300c1a 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -7,10 +7,6 @@
 # by tools/gen-spec-dependencies during "make dist", but keep a hardcoded fallback
 %define required_base 122
 
-%if 0%{?centos}
-%define rhel 0
-%endif
-
 # for testing this already gets set in fedora.install, as we want the target
 # VERSION_ID, not the mock chroot's one
 %if "%{!?os_version_id:1}"
@@ -32,7 +28,7 @@
 # on RHEL 7.x we build subscriptions; superseded later by
 # external subscription-manager-cockpit
 %if 0%{?rhel} >= 7 && 0%{?rhel} < 8
-%define build_subscriptions 1
+%define build_subscriptions 0
 %endif
 
 
@@ -238,12 +234,8 @@ echo '%dir %{_datadir}/cockpit/ovirt' > ovirt.list
 find %{buildroot}%{_datadir}/cockpit/ovirt -type f >> ovirt.list
 
 # on CentOS systems we don't have the required setroubleshoot-server packages
-%if 0%{?centos}
-rm -rf %{buildroot}%{_datadir}/cockpit/selinux
-%else
 echo '%dir %{_datadir}/cockpit/selinux' > selinux.list
 find %{buildroot}%{_datadir}/cockpit/selinux -type f >> selinux.list
-%endif
 
 %ifarch x86_64 %{arm} aarch64 ppc64le i686 s390x
 echo '%dir %{_datadir}/cockpit/docker' > docker.list
@@ -395,6 +387,8 @@ embed or extend Cockpit.
 %exclude %{_docdir}/cockpit/COPYING
 %exclude %{_docdir}/cockpit/README.md
 %{_docdir}/cockpit
+/usr/share/cockpit/ovirt/*
+/usr/share/cockpit/apps/*
 
 %package system
 Summary: Cockpit admin interface package for configuring and troubleshooting a system
@@ -542,8 +536,6 @@ The Cockpit component for managing networking.  This package uses NetworkManager
 
 %endif
 
-%if 0%{?rhel}%{?centos} == 0
-
 %package selinux
 Summary: Cockpit SELinux package
 Requires: cockpit-bridge >= %{required_base}
@@ -559,8 +551,6 @@ utility setroubleshoot to diagnose and resolve SELinux issues.
 
 %files selinux -f selinux.list
 
-%endif
-
 %else # build basic packages
 
 # RPM requires this
@@ -706,7 +696,7 @@ bastion hosts, and a basic dashboard.
 
 %endif
 
-%ifarch x86_64 %{arm} aarch64 ppc64le s390x
+%ifarch x86_64 %{arm} aarch64 ppc64le s390 %{ix86}
 
 %package -n cockpit-docker
 Summary: Cockpit user interface for Docker containers
@@ -728,7 +718,7 @@ This package is not yet complete.
 
 %endif
 
-%ifarch aarch64 x86_64 ppc64le i686 s390x
+%ifarch aarch64 x86_64 ppc64le 390x
 
 %package -n cockpit-kubernetes
 Summary: Cockpit user interface for Kubernetes cluster
@@ -767,6 +757,9 @@ The Cockpit component for installing package updates, via PackageKit.
 %endif # build optional extension packages
 
 %changelog
+* Thu Aug 23 2018 Johnny Hughes <johnny@centos.org> 172-2
+- Manual CentOS Debranding
+
 * Mon Jul 16 2018 Martin Pitt <mpitt@redhat.com> 172-2
 - Update to 172 release
 - Software Updates: Layout rework