diff --git a/google-api-key b/google-api-key
new file mode 100644
index 0000000..b95d189
--- /dev/null
+++ b/google-api-key
@@ -0,0 +1 @@
+AIzaSyBPGXa4AYD4FC3HJK7LnIKxm4fDusVuuco
diff --git a/mozilla-api-key b/mozilla-api-key
new file mode 100644
index 0000000..81877bc
--- /dev/null
+++ b/mozilla-api-key
@@ -0,0 +1 @@
+9008bb7e-1e22-4038-94fe-047dd48ccc0b
diff --git a/nss-setup-flags-env.inc b/nss-setup-flags-env.inc
new file mode 100644
index 0000000..c3624b1
--- /dev/null
+++ b/nss-setup-flags-env.inc
@@ -0,0 +1,7 @@
+sed -i 's@%{gtk3_install_path}@%{_buildrootdir}%{gtk3_install_path}@g' %{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig/nss*.pc
+
+export LDFLAGS="-L%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
+export LDFLAGS="-Wl,-rpath,%{gtk3_install_path}/%{_lib} $LDFLAGS"
+export LDFLAGS="-Wl,-rpath-link,%{_buildrootdir}%{gtk3_install_path}/%{_lib} $LDFLAGS"
+export PKG_CONFIG_PATH=%{_buildrootdir}%{gtk3_install_path}/%{_lib}/pkgconfig
+export PATH="{_buildrootdir}%{gtk3_install_path}/bin:$PATH"
diff --git a/thunderbird-redhat-default-prefs.js.rhel6 b/thunderbird-redhat-default-prefs.js.rhel6
new file mode 100644
index 0000000..26e8d17
--- /dev/null
+++ b/thunderbird-redhat-default-prefs.js.rhel6
@@ -0,0 +1,33 @@
+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);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
+pref("datareporting.healthreport.uploadEnabled", false);
+pref("datareporting.policy.dataSubmissionEnabled", false);
+pref("toolkit.telemetry.archive.enabled", false);
diff --git a/thunderbird-redhat-default-prefs.js.rhel7 b/thunderbird-redhat-default-prefs.js.rhel7
new file mode 100644
index 0000000..26e8d17
--- /dev/null
+++ b/thunderbird-redhat-default-prefs.js.rhel7
@@ -0,0 +1,33 @@
+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);
+/* Use OS settings for UI language */
+pref("intl.locale.requested", "");
+pref("datareporting.healthreport.uploadEnabled", false);
+pref("datareporting.policy.dataSubmissionEnabled", false);
+pref("toolkit.telemetry.archive.enabled", false);
diff --git a/thunderbird.spec b/thunderbird.spec
index 83ef323..aa56459 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -202,13 +202,6 @@ Source21:       thunderbird.sh.in
 Source24:       mozilla-api-key
 Source27:       google-api-key
 Source28:       node-stdout-nonblocking-wrapper
-Source200:      gtk3-private-%{gtk3_nvr}.el6.src.rpm
-Source201:      gtk3-private-%{gtk3_nvr}-post.inc
-Source202:      gtk3-private-%{gtk3_nvr}-postun.inc
-Source203:      gtk3-private-%{gtk3_nvr}-posttrans.inc
-Source204:      gtk3-private-%{gtk3_nvr}-files.inc
-Source205:      gtk3-private-%{gtk3_nvr}-setup-flags-env.inc
-Source206:      gtk3-private-%{gtk3_nvr}-requires-provides-filter.inc
 Source301:      yasm-1.2.0-3.el5.src.rpm
 Source303:      libffi-3.0.13-18.el7_3.src.rpm
 Source304:      nodejs-10.21.0-5.fc32.src.rpm