diff --git a/.gitignore b/.gitignore
index 6b2234e..703f7ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-SOURCES/l10n-lightning-38.4.0.tar.bz2
-SOURCES/thunderbird-38.4.0.source.tar.bz2
-SOURCES/thunderbird-langpacks-38.4.0-20151122.tar.bz2
+SOURCES/l10n-lightning-38.5.0.tar.bz2
+SOURCES/thunderbird-38.5.0.source.tar.bz2
+SOURCES/thunderbird-langpacks-38.5.0-20151222.tar.bz2
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 574edc1..fd0b271 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,3 +1,3 @@
-b944cb59b3fcc16198a0647bc5c289d9a77c0411 SOURCES/l10n-lightning-38.4.0.tar.bz2
-e180f19b920ff2d9c1d4c90df6b5c8b99b103116 SOURCES/thunderbird-38.4.0.source.tar.bz2
-85e7efbe21c0ce4f65228b29096cc3d2cb09cbee SOURCES/thunderbird-langpacks-38.4.0-20151122.tar.bz2
+b944cb59b3fcc16198a0647bc5c289d9a77c0411 SOURCES/l10n-lightning-38.5.0.tar.bz2
+75ae57e7ae018a07a55ce4402ae9f88e7867559f SOURCES/thunderbird-38.5.0.source.tar.bz2
+d028997e67cf54ac7ba328d68d2f3ce332527f94 SOURCES/thunderbird-langpacks-38.5.0-20151222.tar.bz2
diff --git a/SOURCES/thunderbird-centos-default-prefs.js b/SOURCES/thunderbird-centos-default-prefs.js
deleted file mode 100644
index 013aa21..0000000
--- a/SOURCES/thunderbird-centos-default-prefs.js
+++ /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 b/SOURCES/thunderbird-redhat-default-prefs.js
new file mode 100644
index 0000000..af23193
--- /dev/null
+++ b/SOURCES/thunderbird-redhat-default-prefs.js
@@ -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 f059a10..e27ce10 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -62,14 +62,14 @@
 
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
-Version:        38.4.0
+Version:        38.5.0
 Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.bz2
 %if %{build_langpacks}
-Source1:        thunderbird-langpacks-%{version}-20151122.tar.bz2
+Source1:        thunderbird-langpacks-%{version}-20151222.tar.bz2
 %endif
 # Locales for lightning
 Source2:        l10n-lightning-%{version}.tar.bz2
@@ -77,7 +77,7 @@ Source3:        mklangsource.sh
 
 Source10:       thunderbird-mozconfig
 Source11:       thunderbird-mozconfig-branded
-Source12:       thunderbird-centos-default-prefs.js
+Source12:       thunderbird-redhat-default-prefs.js
 Source20:       thunderbird.desktop
 Source21:       thunderbird.sh.in
 Source100:      find-external-requires
@@ -585,8 +585,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Thu Nov 26 2015 CentOS Sources <bugs@centos.org> - 38.4.0-1.el7.centos
-- rebrand default prefs
+* Tue Dec 22 2015 Jan Horak <jhorak@redhat.com> - 38.5.0-1
+- Update to 38.5.0
 
 * Sun Nov 22 2015 Jan Horak <jhorak@redhat.com> - 38.4.0-1
 - Update to 38.4.0