diff --git a/SOURCES/sos-centos-branding.patch b/SOURCES/sos-centos-branding.patch
index 12e8f1a..86ab010 100644
--- a/SOURCES/sos-centos-branding.patch
+++ b/SOURCES/sos-centos-branding.patch
@@ -1185,91 +1185,46 @@ diff -uNrp sos-3.0.orig/po/zu.po sos-3.0/po/zu.po
msgstr ""
#: ../sos/policyredhat.py:401
-diff -uNrp sos-3.0.orig/sos/plugins/apache.py sos-3.0/sos/plugins/apache.py
---- sos-3.0.orig/sos/plugins/apache.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/apache.py 2014-06-21 11:20:20.422520121 -0500
-@@ -22,7 +22,7 @@ class Apache(Plugin):
- option_list = [("log", "gathers all apache logs", "slow", False)]
-
- class RedHatApache(Apache, RedHatPlugin):
-- """Apache related information for Red Hat distributions
-+ """Apache related information for CentOS distributions
- """
- files = ('/etc/httpd/conf/httpd.conf',)
+diff -uNrp sos-3.2.orig/sos/plugins/cluster.py sos-3.2/sos/plugins/cluster.py
+--- sos-3.2.orig/sos/plugins/cluster.py 2014-09-30 12:38:28.000000000 -0500
++++ sos-3.2/sos/plugins/cluster.py 2015-03-09 14:58:02.982869116 -0500
+@@ -19,7 +19,7 @@ from datetime import datetime, timedelta
-diff -uNrp sos-3.0.orig/sos/plugins/cgroups.py sos-3.0/sos/plugins/cgroups.py
---- sos-3.0.orig/sos/plugins/cgroups.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/cgroups.py 2014-06-21 11:20:20.424520105 -0500
-@@ -30,7 +30,7 @@ class DebianCgroups(Cgroups, DebianPlugi
- return
- class RedHatCgroups(Cgroups, RedHatPlugin):
-- """Red Hat specific cgroup subsystem information
-+ """CentOS specific cgroup subsystem information
+ class Cluster(Plugin, RedHatPlugin):
+- """Red Hat Cluster Suite and GFS
++ """Cluster Suite and GFS
"""
- def setup(self):
-diff -uNrp sos-3.0.orig/sos/plugins/cs.py sos-3.0/sos/plugins/cs.py
---- sos-3.0.orig/sos/plugins/cs.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/cs.py 2014-06-21 11:20:20.425520098 -0500
-@@ -21,7 +21,7 @@ from os.path import exists
- from glob import glob
-
- class CertificateSystem(Plugin, RedHatPlugin):
-- """Red Hat Certificate System 7.1, 7.3, 8.0 and dogtag related information
-+ """CentOS Certificate System 7.1, 7.3, 8.0 and dogtag related information
- """
-
- plugin_name = 'certificatesystem'
-@@ -49,7 +49,7 @@ class CertificateSystem(Plugin, RedHatPl
+ plugin_name = 'cluster'
+diff -uNrp sos-3.2.orig/sos/plugins/cs.py sos-3.2/sos/plugins/cs.py
+--- sos-3.2.orig/sos/plugins/cs.py 2014-09-30 12:38:28.000000000 -0500
++++ sos-3.2/sos/plugins/cs.py 2015-03-09 14:58:20.085778645 -0500
+@@ -54,7 +54,7 @@ class CertificateSystem(Plugin, RedHatPl
def setup(self):
csversion = self.checkversion()
if not csversion:
- self.add_alert("Red Hat Certificate System not found.")
-+ self.add_alert("CentOS Certificate System not found.")
++ self.add_alert("Certificate System not found.")
return
if csversion == 71:
- self.add_copy_specs([
-diff -uNrp sos-3.0.orig/sos/plugins/dhcp.py sos-3.0/sos/plugins/dhcp.py
---- sos-3.0.orig/sos/plugins/dhcp.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/dhcp.py 2014-06-21 11:20:20.426520091 -0500
-@@ -21,7 +21,7 @@ class Dhcp(Plugin):
- plugin_name = "dhcp"
-
- class RedHatDhcp(Dhcp, RedHatPlugin):
-- """DHCP related information for Red Hat based distributions"""
-+ """DHCP related information for CentOS based distributions"""
-
- files = ('/etc/rc.d/init.d/dhcpd',)
- packages = ('dhcp',)
-diff -uNrp sos-3.0.orig/sos/plugins/hardware.py sos-3.0/sos/plugins/hardware.py
---- sos-3.0.orig/sos/plugins/hardware.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/hardware.py 2014-06-21 11:20:20.429520069 -0500
-@@ -36,7 +36,7 @@ class Hardware(Plugin):
-
-
- class RedHatHardware(Hardware, RedHatPlugin):
-- """hardware related information for Red Hat distribution
-+ """hardware related information for CentOS distribution
- """
+ self.add_copy_spec([
+diff -uNrp sos-3.2.orig/sos/plugins/hts.py sos-3.2/sos/plugins/hts.py
+--- sos-3.2.orig/sos/plugins/hts.py 2014-09-30 12:38:28.000000000 -0500
++++ sos-3.2/sos/plugins/hts.py 2015-03-09 14:58:36.973689309 -0500
+@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPl
- def setup(self):
-diff -uNrp sos-3.0.orig/sos/plugins/hts.py sos-3.0/sos/plugins/hts.py
---- sos-3.0.orig/sos/plugins/hts.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/hts.py 2014-06-21 11:20:20.429520069 -0500
-@@ -15,7 +15,7 @@
- from sos.plugins import Plugin, RedHatPlugin
class HardwareTestSuite(Plugin, RedHatPlugin):
-- """Red Hat Hardware Test Suite related information
-+ """CentOS Hardware Test Suite related information
+- """Red Hat Hardware Test Suite
++ """Hardware Test Suite
"""
plugin_name = 'hardwaretestsuite'
-diff -uNrp sos-3.0.orig/sos/plugins/__init__.py sos-3.0/sos/plugins/__init__.py
---- sos-3.0.orig/sos/plugins/__init__.py 2014-06-21 11:11:15.843754983 -0500
-+++ sos-3.0/sos/plugins/__init__.py 2014-06-21 11:20:20.431520054 -0500
-@@ -711,7 +711,7 @@ class Plugin(object):
+diff -uNrp sos-3.2.orig/sos/plugins/__init__.py sos-3.2/sos/plugins/__init__.py
+--- sos-3.2.orig/sos/plugins/__init__.py 2015-03-09 14:50:34.162237962 -0500
++++ sos-3.2/sos/plugins/__init__.py 2015-03-09 14:58:56.861584108 -0500
+@@ -732,7 +732,7 @@ class Plugin(object):
class RedHatPlugin(object):
@@ -1277,153 +1232,24 @@ diff -uNrp sos-3.0.orig/sos/plugins/__init__.py sos-3.0/sos/plugins/__init__.py
+ """Tagging class to indicate that this plugin works with CentOS Linux"""
pass
- class UbuntuPlugin(object):
-diff -uNrp sos-3.0.orig/sos/plugins/ipsec.py sos-3.0/sos/plugins/ipsec.py
---- sos-3.0.orig/sos/plugins/ipsec.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/ipsec.py 2014-06-21 11:20:20.432520046 -0500
-@@ -24,7 +24,7 @@ class IPSec(Plugin):
- packages = ('ipsec-tools',)
-
- class RedHatIpsec(IPSec, RedHatPlugin):
-- """ipsec related information for Red Hat distributions
-+ """ipsec related information for CentOS distributions
- """
-
- files = ('/etc/racoon/racoon.conf',)
-diff -uNrp sos-3.0.orig/sos/plugins/iscsi.py sos-3.0/sos/plugins/iscsi.py
---- sos-3.0.orig/sos/plugins/iscsi.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/iscsi.py 2014-06-21 11:20:20.432520046 -0500
-@@ -22,7 +22,7 @@ class Iscsi(Plugin):
- plugin_name = "iscsi"
- class RedHatIscsi(Iscsi, RedHatPlugin):
-- """iscsi-initiator related information Red Hat based distributions
-+ """iscsi-initiator related information CentOS based distributions
- """
-
- packages = ('iscsi-initiator-utils',)
-diff -uNrp sos-3.0.orig/sos/plugins/iscsitarget.py sos-3.0/sos/plugins/iscsitarget.py
---- sos-3.0.orig/sos/plugins/iscsitarget.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/iscsitarget.py 2014-06-21 11:20:20.432520046 -0500
-@@ -24,7 +24,7 @@ class IscsiTarget(Plugin):
- plugin_name = "iscsitarget"
-
- class RedHatIscsiTarget(IscsiTarget, RedHatPlugin):
-- """iscsi-target related information for Red Hat distributions
-+ """iscsi-target related information for CentOS distributions
- """
-
- packages = ('scsi-target-utils',)
-diff -uNrp sos-3.0.orig/sos/plugins/kdump.py sos-3.0/sos/plugins/kdump.py
---- sos-3.0.orig/sos/plugins/kdump.py 2014-06-21 11:11:15.785755436 -0500
-+++ sos-3.0/sos/plugins/kdump.py 2014-06-21 11:20:20.433520039 -0500
-@@ -26,7 +26,7 @@ class KDump(Plugin):
- ])
-
- class RedHatKDump(KDump, RedHatPlugin):
-- """Kdump related information for Red Hat distributions
-+ """Kdump related information for CentOS distributions
- """
-
- files = ('/etc/kdump.conf',)
-diff -uNrp sos-3.0.orig/sos/plugins/openssl.py sos-3.0/sos/plugins/openssl.py
---- sos-3.0.orig/sos/plugins/openssl.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/openssl.py 2014-06-21 11:20:20.437520009 -0500
-@@ -24,7 +24,7 @@ class OpenSSL(Plugin):
- packages = ('openssl',)
-
- class RedHatOpenSSL(OpenSSL, RedHatPlugin):
-- """openssl related information for Red Hat distributions
-+ """openssl related information for CentOS distributions
- """
-
- files = ('/etc/pki/tls/openssl.cnf',)
-diff -uNrp sos-3.0.orig/sos/plugins/openstack.py sos-3.0/sos/plugins/openstack.py
---- sos-3.0.orig/sos/plugins/openstack.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/openstack.py 2014-06-21 11:20:20.438520002 -0500
-@@ -153,7 +153,7 @@ class DebianOpenStack(OpenStack, DebianP
-
-
- class RedHatOpenStack(OpenStack, RedHatPlugin):
-- """OpenStack related information for Red Hat distributions
-+ """OpenStack related information for CentOS distributions
- """
-
- packages = ('openstack-nova',
-diff -uNrp sos-3.0.orig/sos/plugins/postgresql.py sos-3.0/sos/plugins/postgresql.py
---- sos-3.0.orig/sos/plugins/postgresql.py 2013-06-10 12:35:56.000000000 -0500
-+++ sos-3.0/sos/plugins/postgresql.py 2014-06-21 11:20:20.438520002 -0500
-@@ -49,7 +49,7 @@ class PostgreSQL(Plugin):
- shutil.rmtree(self.tmp_dir)
-
- class RedHatPostgreSQL(PostgreSQL, RedHatPlugin):
-- """PostgreSQL related information for Red Hat distributions"""
-+ """PostgreSQL related information for CentOS distributions"""
-
- def setup(self):
- super(RedHatPostgreSQL, self).setup()
-diff -uNrp sos-3.0.orig/sos/plugins/radius.py sos-3.0/sos/plugins/radius.py
---- sos-3.0.orig/sos/plugins/radius.py 2013-06-10 12:35:57.000000000 -0500
-+++ sos-3.0/sos/plugins/radius.py 2014-06-21 11:20:20.440519987 -0500
-@@ -24,7 +24,7 @@ class Radius(Plugin):
- packages = ('freeradius',)
-
- class RedHatRadius(Radius, RedHatPlugin):
-- """radius related information on Red Hat distributions
-+ """radius related information on CentOS distributions
- """
-
- files = ('/etc/raddb',)
-diff -uNrp sos-3.0.orig/sos/plugins/rhui.py sos-3.0/sos/plugins/rhui.py
---- sos-3.0.orig/sos/plugins/rhui.py 2013-06-10 12:35:57.000000000 -0500
-+++ sos-3.0/sos/plugins/rhui.py 2014-06-21 11:20:20.440519987 -0500
+diff -uNrp sos-3.2.orig/sos/plugins/rhui.py sos-3.2/sos/plugins/rhui.py
+--- sos-3.2.orig/sos/plugins/rhui.py 2014-09-30 12:38:28.000000000 -0500
++++ sos-3.2/sos/plugins/rhui.py 2015-03-09 14:59:16.909478057 -0500
@@ -16,7 +16,7 @@ from sos.plugins import Plugin, RedHatPl
- import os
+
class Rhui(Plugin, RedHatPlugin):
-- """Red Hat Update Infrastructure for Cloud Providers data
-+ """CentOS Update Infrastructure for Cloud Providers data
+- """Red Hat Update Infrastructure
++ """Update Infrastructure
"""
plugin_name = 'rhui'
-diff -uNrp sos-3.0.orig/sos/plugins/sssd.py sos-3.0/sos/plugins/sssd.py
---- sos-3.0.orig/sos/plugins/sssd.py 2013-06-10 12:35:57.000000000 -0500
-+++ sos-3.0/sos/plugins/sssd.py 2014-06-21 11:20:20.443519965 -0500
-@@ -27,7 +27,7 @@ class Sssd(Plugin):
- self.add_copy_specs(["/etc/sssd", "/var/log/sssd/*"])
-
- class RedHatSssd(Sssd, RedHatPlugin):
-- """sssd-related Diagnostic Information on Red Hat based distributions
-+ """sssd-related Diagnostic Information on CentOS based distributions
- """
+diff -uNrp sos-3.2.orig/sos/policies/redhat.py sos-3.2/sos/policies/redhat.py
+--- sos-3.2.orig/sos/policies/redhat.py 2014-09-30 12:38:28.000000000 -0500
++++ sos-3.2/sos/policies/redhat.py 2015-03-09 14:56:04.383496495 -0500
+@@ -33,9 +33,9 @@ except:
- def setup(self):
-diff -uNrp sos-3.0.orig/sos/plugins/sunrpc.py sos-3.0/sos/plugins/sunrpc.py
---- sos-3.0.orig/sos/plugins/sunrpc.py 2013-06-10 12:35:57.000000000 -0500
-+++ sos-3.0/sos/plugins/sunrpc.py 2014-06-21 11:20:20.443519965 -0500
-@@ -34,7 +34,7 @@ class SunRPC(Plugin):
- return
-
- class RedHatSunRPC(SunRPC, RedHatPlugin):
-- """Sun RPC related information for Red Hat systems
-+ """Sun RPC related information for CentOS systems
- """
-
- service = 'rpcbind'
-@@ -42,7 +42,7 @@ class RedHatSunRPC(SunRPC, RedHatPlugin)
- # FIXME: depends on addition of runlevel_by_service (or similar)
- # in Debian/Ubuntu policy classes
- #class DebianSunRPC(SunRPC, DebianPlugin, UbuntuPlugin):
--# """Sun RPC related information for Red Hat systems
-+# """Sun RPC related information for CentOS systems
- # """
- #
- # service = 'rpcbind-boot'
-diff -uNrp sos-3.0.orig/sos/policies/redhat.py sos-3.0/sos/policies/redhat.py
---- sos-3.0.orig/sos/policies/redhat.py 2014-06-21 11:11:15.838755022 -0500
-+++ sos-3.0/sos/policies/redhat.py 2014-06-21 11:22:10.554703632 -0500
-@@ -32,9 +32,9 @@ except:
- pass
class RedHatPolicy(LinuxPolicy):
- distro = "Red Hat"
@@ -1435,7 +1261,7 @@ diff -uNrp sos-3.0.orig/sos/policies/redhat.py sos-3.0/sos/policies/redhat.py
_tmp_dir = "/var/tmp"
def __init__(self):
-@@ -56,9 +56,9 @@ class RedHatPolicy(LinuxPolicy):
+@@ -57,9 +57,9 @@ class RedHatPolicy(LinuxPolicy):
@classmethod
def check(self):
@@ -1443,12 +1269,12 @@ diff -uNrp sos-3.0.orig/sos/policies/redhat.py sos-3.0/sos/policies/redhat.py
+ """This method checks to see if we are running on CentOS. It must be
overriden by concrete subclasses to return True when running on a
- Fedora, RHEL or other Red Hat distribution or False otherwise."""
-+ CentOS distribution or False otherwise."""
++ CentOS or False otherwise."""
return False
def runlevel_by_service(self, name):
-@@ -92,9 +92,9 @@ class RedHatPolicy(LinuxPolicy):
- return self.host_name()
+@@ -94,9 +94,9 @@ class RedHatPolicy(LinuxPolicy):
+
class RHELPolicy(RedHatPolicy):
- distro = "Red Hat Enterprise Linux"
@@ -1457,6 +1283,6 @@ diff -uNrp sos-3.0.orig/sos/policies/redhat.py sos-3.0/sos/policies/redhat.py
+ distro = "CentOS Linux"
+ vendor = "CentOS"
+ vendor_url = "https://www.centos.org/"
-
- def __init__(self):
- super(RHELPolicy, self).__init__()
+ msg = _("""\
+ This command will collect diagnostic and configuration \
+ information from this %(distro)s system and installed \