diff --git a/.gitignore b/.gitignore
index 9c63a81..fc79f18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/thunderbird-31.5.0.source.tar.bz2
-SOURCES/thunderbird-langpacks-31.5.0-20150223.tar.bz2
+SOURCES/thunderbird-31.6.0.source.tar.bz2
+SOURCES/thunderbird-langpacks-31.6.0-20150331.tar.bz2
diff --git a/.thunderbird.metadata b/.thunderbird.metadata
index 5e6e2a5..c03db91 100644
--- a/.thunderbird.metadata
+++ b/.thunderbird.metadata
@@ -1,2 +1,2 @@
-8052a39f8acea26361a21add1ae11c464ecaa24c SOURCES/thunderbird-31.5.0.source.tar.bz2
-9b15e6792df9e04ec0ebeb2ec0481c318d249a30 SOURCES/thunderbird-langpacks-31.5.0-20150223.tar.bz2
+147ba0f3c7da29a7814ee9ce4265fb107744559e SOURCES/thunderbird-31.6.0.source.tar.bz2
+7527d77e99d694dbdbd01f74117eb564fd0e031f SOURCES/thunderbird-langpacks-31.6.0-20150331.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/SPECS/thunderbird.spec b/SPECS/thunderbird.spec
index b25e604..ddbfccb 100644
--- a/SPECS/thunderbird.spec
+++ b/SPECS/thunderbird.spec
@@ -66,8 +66,8 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 31.5.0
-Release: 2%{?dist}
+Version: 31.6.0
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -75,11 +75,11 @@ 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}-20150223.tar.bz2
+Source1: thunderbird-langpacks-%{version}-20150331.tar.bz2
%endif
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
@@ -483,8 +483,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
-* Wed Mar 18 2015 Johnny Hughes <johnny@centos.org> - 31.5.0-2
-- Roll in CentOS Branding
+* Tue Mar 31 2015 Jan Horak <jhorak@redhat.com> - 31.6.0-1
+- Update to 31.6.0
* Mon Feb 23 2015 Jan Horak <jhorak@redhat.com> - 31.5.0-2
- Update to 31.5.0