diff --git a/firefox.sh.in b/firefox.sh.in
index 2623007..3bda263 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -83,12 +83,23 @@ FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
 export FONTCONFIG_PATH
 
 ##
-## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
-## you may use MOZ_DISABLE_PANGO=1 to force disabling of pango
+## Set MOZ_ENABLE_PANGO=1  to force enabling pango
+## Set MOZ_DISABLE_PANGO=1 to force disabling of pango
 ##
 #MOZ_DISABLE_PANGO=1
 #export MOZ_DISABLE_PANGO
 
+# For now, in order to ship with firefox trademarks, we need to default to
+# disable pango on non-indic locales.  Use MOZ_ENABLE_PANGO=1 to force pango.
+tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8"}}
+if ! echo $tmplang | grep "^..[_-]IN" > /dev/null; then
+   if [ -z "$MOZ_ENABLE_PANGO" ]; then
+     MOZ_DISABLE_PANGO=1
+     export MOZ_DISABLE_PANGO
+   fi
+fi
+
+
 function check_running() {
     $MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM 'ping()' 2>/dev/null >/dev/null
     RETURN_VAL=$?
diff --git a/firefox.spec b/firefox.spec
index 26f8d6c..b656a39 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.1
-Release:        7
+Release:        8
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -265,6 +265,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Mar 10 2006 Christopher Aillon <caillon@redhat.com> - 1.5.0.1-8
+- Disable pango by default in non-indic locales per upstream request.
+  Users can export MOZ_ENABLE_PANGO=1 to force pango support.
+
 * Mon Mar  6 2006 Warren Togami <wtogami@redhat.com> - 1.5.0.1-7
 - make links point to the correct release