diff --git a/build/unix/mozconfig.linux b/build/unix/mozconfig.linux
index 60fc174c91..c050a7c95e 100644
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -4,3 +4,6 @@ CC="/tools/gcc-4.7.2-0moz1/bin/gcc"
 CXX="/tools/gcc-4.7.2-0moz1/bin/g++"
 
 ac_add_options --enable-elf-hack
+
+# Avoid dependency on libstdc++ 4.7
+ac_add_options --enable-stdcxx-compat
diff --git a/mail/config/mozconfigs/linux32/debug b/mail/config/mozconfigs/linux32/debug
index 9a7634af0c..cb1ac0bb43 100644
--- a/mail/config/mozconfigs/linux32/debug
+++ b/mail/config/mozconfigs/linux32/debug
@@ -6,9 +6,6 @@ ac_add_options --enable-calendar
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
diff --git a/mail/config/mozconfigs/linux32/l10n-mozconfig b/mail/config/mozconfigs/linux32/l10n-mozconfig
index 31decdeb4d..0b72e408de 100644
--- a/mail/config/mozconfigs/linux32/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux32/l10n-mozconfig
@@ -14,9 +14,6 @@ ac_add_options --disable-gio
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
diff --git a/mail/config/mozconfigs/linux32/nightly b/mail/config/mozconfigs/linux32/nightly
index b955ca0110..c1581cb6cf 100644
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -9,9 +9,6 @@ ac_add_options --enable-profiling
 ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 ac_add_options --enable-calendar
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
diff --git a/mail/config/mozconfigs/linux32/release b/mail/config/mozconfigs/linux32/release
index fd459c92b2..e6e6d3a4cb 100644
--- a/mail/config/mozconfigs/linux32/release
+++ b/mail/config/mozconfigs/linux32/release
@@ -6,9 +6,6 @@ ac_add_options --enable-calendar
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
diff --git a/mail/config/mozconfigs/linux32/release-l10n b/mail/config/mozconfigs/linux32/release-l10n
index c4c8926a39..4a77d8c2ef 100644
--- a/mail/config/mozconfigs/linux32/release-l10n
+++ b/mail/config/mozconfigs/linux32/release-l10n
@@ -3,7 +3,6 @@ ac_add_options --enable-application=mail
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
diff --git a/mail/config/mozconfigs/linux64/debug b/mail/config/mozconfigs/linux64/debug
index a64e0e6cba..50ef398517 100644
--- a/mail/config/mozconfigs/linux64/debug
+++ b/mail/config/mozconfigs/linux64/debug
@@ -6,9 +6,6 @@ ac_add_options --enable-calendar
 
 . $topsrcdir/build/unix/mozconfig.linux
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
diff --git a/mail/config/mozconfigs/linux64/l10n-mozconfig b/mail/config/mozconfigs/linux64/l10n-mozconfig
index 883c32f324..eaf6418948 100644
--- a/mail/config/mozconfigs/linux64/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux64/l10n-mozconfig
@@ -14,9 +14,6 @@ ac_add_options --disable-gio
 
 . $topsrcdir/build/unix/mozconfig.linux
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
diff --git a/mail/config/mozconfigs/linux64/nightly b/mail/config/mozconfigs/linux64/nightly
index d1281ff480..2b456c9650 100644
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -9,9 +9,6 @@ ac_add_options --enable-profiling
 ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 ac_add_options --enable-calendar
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
diff --git a/mail/config/mozconfigs/linux64/release b/mail/config/mozconfigs/linux64/release
index 8767764da8..2404a97f52 100644
--- a/mail/config/mozconfigs/linux64/release
+++ b/mail/config/mozconfigs/linux64/release
@@ -6,9 +6,6 @@ ac_add_options --enable-calendar
 
 . $topsrcdir/build/unix/mozconfig.linux
 
-# Avoid dependency on libstdc++ 4.5
-ac_add_options --enable-stdcxx-compat
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
diff --git a/mail/config/mozconfigs/linux64/release-l10n b/mail/config/mozconfigs/linux64/release-l10n
index ec24b8b5b1..ef5472c3e5 100644
--- a/mail/config/mozconfigs/linux64/release-l10n
+++ b/mail/config/mozconfigs/linux64/release-l10n
@@ -3,7 +3,6 @@ ac_add_options --enable-application=mail
 ac_add_options --enable-official-branding
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
-ac_add_options --enable-stdcxx-compat
 
 . $topsrcdir/build/unix/mozconfig.linux