diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index e19bae6..4dba861 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -8,7 +8,7 @@
 %define required_base 122
 
 %if 0%{?centos}
-%define rhel 0
+%define rhel %{?centos}
 %endif
 
 # for testing this already gets set in fedora.install, as we want the target
@@ -31,7 +31,7 @@
 
 # on RHEL 7.x we build subscriptions; superseded later by
 # external subscription-manager-cockpit
-%if 0%{?rhel} >= 7 && 0%{?rhel} < 8
+%if (0%{?rhel} >= 7 && 0%{?rhel} < 8) && 0%{?centos} == 0
 %define build_subscriptions 1
 %endif
 
@@ -247,13 +247,8 @@ find %{buildroot}%{_datadir}/cockpit/machines -type f >> machines.list
 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
 %if 0%{?fedora} || 0%{?rhel} < 8
@@ -268,7 +263,7 @@ rm -rf %{buildroot}/%{_datadir}/cockpit/docker
 touch docker.list
 %endif
 
-%ifarch aarch64 x86_64 ppc64le s390x
+%ifarch aarch64 x86_64 ppc64le s390x %{arm} %{ix86}
 %if %{defined wip}
 %else
 rm %{buildroot}/%{_datadir}/cockpit/kubernetes/override.json
@@ -764,7 +759,7 @@ This package is not yet complete.
 %endif
 %endif
 
-%ifarch aarch64 x86_64 ppc64le s390x
+%ifarch aarch64 x86_64 ppc64le s390x %{ix86}
 
 %package -n cockpit-kubernetes
 Summary: Cockpit user interface for Kubernetes cluster
@@ -805,6 +800,9 @@ via PackageKit.
 %endif # build optional extension packages
 
 %changelog
+* Tue Mar 12 2019 Johnny Hughes <johnny@centos.org>
+- Manual CentOS Debranding
+
 * Wed Jan 30 2019 Martin Pitt <mpitt@redhat.com> 173.2-1
 - ws: Fix bug parsing invalid base64 headers rhbz#1672296