diff --git a/.gitignore b/.gitignore
index ded4908..9f69678 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
SOURCES/Python-2.7.8.tgz
SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm
SOURCES/gcc48-4.8.2-16.el5.src.rpm
-SOURCES/l10n-lightning-52.7.0.tar.xz
-SOURCES/thunderbird-52.7.0.source.tar.xz
-SOURCES/thunderbird-langpacks-52.7.0-20180326.tar.xz
+SOURCES/l10n-lightning-52.8.0.tar.xz
+SOURCES/thunderbird-52.8.0.source.tar.xz
+SOURCES/thunderbird-langpacks-52.8.0-20180517.tar.xz
SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 883c09c..a9f4716 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,7 +1,7 @@
511960dd78451a06c9df76509635aeec05b2051a SOURCES/Python-2.7.8.tgz
467bdb846d67c01aed9e521fe0ef280065a50c3c SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm
e5ba84786af5d0e0e23b1a9112c76821ef23306c SOURCES/gcc48-4.8.2-16.el5.src.rpm
-fdf114fc6c1bf99affcede52c41dd598c3a75884 SOURCES/l10n-lightning-52.7.0.tar.xz
-9030278d1fb4cd28a3a5e8830cfb98a8f0d45523 SOURCES/thunderbird-52.7.0.source.tar.xz
-86fba0c565c6bfc97f610d4ab29a430c6715ab7b SOURCES/thunderbird-langpacks-52.7.0-20180326.tar.xz
+99b97cff295594011c0886342be4d883cdf1e024 SOURCES/l10n-lightning-52.8.0.tar.xz
+b8aabca309c15ac239a8334df63b330cd6a35c39 SOURCES/thunderbird-52.8.0.source.tar.xz
+14c289fa6582a33720a92a1729f341bee6b069c1 SOURCES/thunderbird-langpacks-52.8.0-20180517.tar.xz
77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.el6 b/SOURCES/thunderbird-redhat-default-prefs.js.el6
deleted file mode 100644
index 013aa21..0000000
--- a/SOURCES/thunderbird-redhat-default-prefs.js.el6
+++ /dev/null
@@ -1,28 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-# Allow users to set custom colors
-# pref("browser.display.use_system_colors", true);
-pref("general.useragent.vendor", "CentOS");
-pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
-pref("intl.locale.matchOS", true);
-pref("mail.shell.checkDefaultClient", false);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-
-# Disable global indexing by default
-pref("mailnews.database.global.indexer.enabled", false);
-
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1")
-pref("extensions.shownSelectionUI", true);
-pref("extensions.autoDisableScope", 0);
-
-# For rhbz#1024232
-pref("ui.SpellCheckerUnderlineStyle", 1);
-
-/* Workaround for rhbz#1134876 */
-pref("javascript.options.baselinejit", false);
-/* Workaround for rhbz#1110291 */
-pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
-/* Workaround for mozbz#1063315 */
-pref("security.use_mozillapkix_verification", false);
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.el7 b/SOURCES/thunderbird-redhat-default-prefs.js.el7
deleted file mode 100644
index 013aa21..0000000
--- a/SOURCES/thunderbird-redhat-default-prefs.js.el7
+++ /dev/null
@@ -1,28 +0,0 @@
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-# Allow users to set custom colors
-# pref("browser.display.use_system_colors", true);
-pref("general.useragent.vendor", "CentOS");
-pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
-pref("intl.locale.matchOS", true);
-pref("mail.shell.checkDefaultClient", false);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-
-# Disable global indexing by default
-pref("mailnews.database.global.indexer.enabled", false);
-
-# Do not switch to Smart Folders after upgrade to 3.0b4
-pref("mail.folder.views.version", "1")
-pref("extensions.shownSelectionUI", true);
-pref("extensions.autoDisableScope", 0);
-
-# For rhbz#1024232
-pref("ui.SpellCheckerUnderlineStyle", 1);
-
-/* Workaround for rhbz#1134876 */
-pref("javascript.options.baselinejit", false);
-/* Workaround for rhbz#1110291 */
-pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
-/* Workaround for mozbz#1063315 */
-pref("security.use_mozillapkix_verification", false);
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel6 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
new file mode 100644
index 0000000..af23193
--- /dev/null
+++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel6
@@ -0,0 +1,28 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+# Allow users to set custom colors
+# pref("browser.display.use_system_colors", true);
+pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
+pref("intl.locale.matchOS", true);
+pref("mail.shell.checkDefaultClient", false);
+pref("toolkit.networkmanager.disable", false);
+pref("offline.autoDetect", true);
+
+# Disable global indexing by default
+pref("mailnews.database.global.indexer.enabled", false);
+
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1")
+pref("extensions.shownSelectionUI", true);
+pref("extensions.autoDisableScope", 0);
+
+# For rhbz#1024232
+pref("ui.SpellCheckerUnderlineStyle", 1);
+
+/* Workaround for rhbz#1134876 */
+pref("javascript.options.baselinejit", false);
+/* Workaround for rhbz#1110291 */
+pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
+/* Workaround for mozbz#1063315 */
+pref("security.use_mozillapkix_verification", false);
diff --git a/SOURCES/thunderbird-redhat-default-prefs.js.rhel7 b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
new file mode 100644
index 0000000..af23193
--- /dev/null
+++ b/SOURCES/thunderbird-redhat-default-prefs.js.rhel7
@@ -0,0 +1,28 @@
+pref("app.update.enabled", false);
+pref("app.update.autoInstallEnabled", false);
+# Allow users to set custom colors
+# pref("browser.display.use_system_colors", true);
+pref("general.useragent.vendor", "Red Hat");
+pref("general.useragent.vendorSub", "THUNDERBIRD_RPM_VR");
+pref("intl.locale.matchOS", true);
+pref("mail.shell.checkDefaultClient", false);
+pref("toolkit.networkmanager.disable", false);
+pref("offline.autoDetect", true);
+
+# Disable global indexing by default
+pref("mailnews.database.global.indexer.enabled", false);
+
+# Do not switch to Smart Folders after upgrade to 3.0b4
+pref("mail.folder.views.version", "1")
+pref("extensions.shownSelectionUI", true);
+pref("extensions.autoDisableScope", 0);
+
+# For rhbz#1024232
+pref("ui.SpellCheckerUnderlineStyle", 1);
+
+/* Workaround for rhbz#1134876 */
+pref("javascript.options.baselinejit", false);
+/* Workaround for rhbz#1110291 */
+pref("network.negotiate-auth.allow-insecure-ntlm-v1", true);
+/* Workaround for mozbz#1063315 */
+pref("security.use_mozillapkix_verification", false);
diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index efe9ac2..f0d65df 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -74,19 +74,19 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 52.7.0
+Version: 52.8.0
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
-%define tarballdir thunderbird-52.7.0
+%define tarballdir thunderbird-52.8.0
%define objdir objdir
# From ftp://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?ext_version}/source
Source0: https://archive.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
-Source1: thunderbird-langpacks-%{version}%{?ext_version}-20180326.tar.xz
+Source1: thunderbird-langpacks-%{version}%{?ext_version}-20180517.tar.xz
%endif
# Locales for lightning
Source2: l10n-lightning-%{version}.tar.xz
@@ -102,9 +102,9 @@ Source300: gcc48-%{gcc_version}.el5.src.rpm
Source301: yasm-1.2.0-3.el5.src.rpm
Source302: devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm
Source600: thunderbird.sh.in.rhel6
-Source601: thunderbird-redhat-default-prefs.js.el6
+Source601: thunderbird-redhat-default-prefs.js.rhel6
Source700: thunderbird.sh.in.rhel7
-Source701: thunderbird-redhat-default-prefs.js.el7
+Source701: thunderbird-redhat-default-prefs.js.rhel7
# Mozilla (XULRunner) patches
Patch0: firefox-install-dir.patch
@@ -858,8 +858,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
-* Mon Apr 9 2018 Johnny Hughes <johnny@centos.org> - 52.7.0-1
-- Manual CentOS Debranding
+* Thu May 17 2018 Jan Horak <jhorak@redhat.com> - 52.8.0-1
+- Update to 52.8.0
* Mon Mar 26 2018 Jan Horak <jhorak@redhat.com> - 52.7.0-1
- Update to 52.7.0