diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/distribution.ini b/SOURCES/distribution.ini
index 8bf461e..0a0429e 100644
--- a/SOURCES/distribution.ini
+++ b/SOURCES/distribution.ini
@@ -1,7 +1,7 @@
[Global]
id=redhat
version=1.0
-about=Mozilla Firefox for Red Hat Enterprise Linux
+about=Mozilla Firefox for CentOS Linux
[Preferences]
app.distributor=redhat
diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js
new file mode 100644
index 0000000..f0e4a19
--- /dev/null
+++ b/SOURCES/firefox-centos-default-prefs.js
@@ -0,0 +1,33 @@
+pref("app.update.auto", false);
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+pref("general.smoothScroll", true);
+pref("intl.locale.matchOS", true);
+pref("toolkit.storage.synchronous", 0);
+pref("toolkit.networkmanager.disable", false);
+pref("offline.autoDetect", true);
+pref("browser.backspace_action", 2);
+pref("browser.display.use_system_colors", true);
+pref("browser.download.folderList", 1);
+pref("browser.link.open_external", 3);
+pref("browser.shell.checkDefaultBrowser", false);
+pref("network.manage-offline-status", true);
+pref("extensions.shownSelectionUI", true);
+pref("ui.SpellCheckerUnderlineStyle", 1);
+pref("startup.homepage_override_url", "http://www.centos.org");
+pref("startup.homepage_welcome_url", "http://www.centos.org");
+pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
+pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
+pref("media.gmp-gmpopenh264.provider.enabled",false);
+pref("media.gmp-gmpopenh264.autoupdate",false);
+pref("media.gmp-gmpopenh264.enabled",false);
+pref("media.gmp-gmpopenh264.enabled",false);
+pref("plugins.notifyMissingFlash", false);
+/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */
+pref("browser.display.use_system_colors", false);
+pref("layers.use-image-offscreen-surfaces", false);
+/* Allow sending credetials to all https:// sites */
+pref("network.negotiate-auth.trusted-uris", "https://");
+pref("security.use_sqldb", false);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js
deleted file mode 100644
index 71d6506..0000000
--- a/SOURCES/firefox-redhat-default-prefs.js
+++ /dev/null
@@ -1,33 +0,0 @@
-pref("app.update.auto", false);
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("general.smoothScroll", true);
-pref("intl.locale.matchOS", true);
-pref("toolkit.storage.synchronous", 0);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-pref("browser.backspace_action", 2);
-pref("browser.display.use_system_colors", true);
-pref("browser.download.folderList", 1);
-pref("browser.link.open_external", 3);
-pref("browser.shell.checkDefaultBrowser", false);
-pref("network.manage-offline-status", true);
-pref("extensions.shownSelectionUI", true);
-pref("ui.SpellCheckerUnderlineStyle", 1);
-pref("startup.homepage_override_url", "http://www.redhat.com");
-pref("startup.homepage_welcome_url", "http://www.redhat.com");
-pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
-pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
-pref("media.gmp-gmpopenh264.provider.enabled",false);
-pref("media.gmp-gmpopenh264.autoupdate",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("plugins.notifyMissingFlash", false);
-/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */
-pref("browser.display.use_system_colors", false);
-pref("layers.use-image-offscreen-surfaces", false);
-/* Allow sending credetials to all https:// sites */
-pref("network.negotiate-auth.trusted-uris", "https://");
-pref("security.use_sqldb", false);
-/* Use OS settings for UI language */
-pref("intl.locale.requested", "");
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index bf8a9ea..3a8456f 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -138,7 +138,7 @@ Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-
Source1: firefox-langpacks-%{version}%{?pre_version}-20180831.tar.xz
%endif
Source10: firefox-mozconfig
-Source12: firefox-redhat-default-prefs.js
+Source12: firefox-centos-default-prefs.js
Source20: firefox.desktop
Source21: firefox.sh.in
Source23: firefox.1
@@ -192,6 +192,9 @@ Patch415: mozilla-1436242.patch
# Debian patches
+# CentOS armhfp patch
+Patch1000: Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+
%if %{?system_nss}
BuildRequires: pkgconfig(nspr) >= %{nspr_version}
BuildRequires: pkgconfig(nss) >= %{nss_version}
@@ -421,6 +424,11 @@ This package contains results of tests executed during build.
%patch26 -p1 -b .icu
%endif
+# CentOS armhfp patch
+%ifarch %{arm}
+%patch1000 -p1 -b .mozilla-1238661
+%endif
+
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
%if %{official_branding}
@@ -1142,6 +1150,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Sep 12 2018 Johnny Hughes <johnny@centos.org> - 60.2.0-1
+- Manual CentOS Debranding
+
* Fri Aug 31 2018 Jan Horak <jhorak@redhat.com> - 60.2.0-1
- Update to 60.2.0 ESR