diff --git a/xinput.sh b/xinput.sh
index 43a9731..b6356ef 100644
--- a/xinput.sh
+++ b/xinput.sh
@@ -29,7 +29,14 @@ unset XIM XIM_PROGRAM XIM_ARGS XMODIFIERS GTK_IM_MODULE QT_IM_MODULE
 if [ -r "$USER_XINPUTRC" ]; then
     source "$USER_XINPUTRC"
 elif [ -r "$SYS_XINPUTRC" ]; then
-    source "$SYS_XINPUTRC"
+    # FIXME: This hardcoded list has to be gone in the future.
+    _language_list="as bn gu hi ja kn ko ml mr ne or pa si ta te th ur vi zh"
+    for i in $_language_list; do
+        if echo $tmplang | grep -q -E "^$i"; then
+            source "$SYS_XINPUTRC"
+            break
+        fi
+    done
 fi
 
 [ -n "$GTK_IM_MODULE" ] && export GTK_IM_MODULE
diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec
index 06823c5..e763172 100644
--- a/xorg-x11-xinit.spec
+++ b/xorg-x11-xinit.spec
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X Window System xinit startup scripts
 Name:      xorg-x11-%{pkgname}
 Version:   1.0.2
-Release:   18%{?dist}
+Release:   19%{?dist}
 License:   MIT/X11
 Group:     User Interface/X
 URL:       http://www.x.org
@@ -112,6 +112,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xinit.1*
 
 %changelog
+* Thu Apr 19 2007 Warren Togami <wtogami@redhat.com> 1.0.2-19
+- disable SCIM by default in non-Asian languages #237054
+  If you want to use SCIM, use im-chooser to enable it.
+
 * Mon Apr 02 2007 David Zeuthen <davidz@redhat.com> 1.0.2-18
 - Man pages are now in section 1, not in section 1x