diff --git a/.cvsignore b/.cvsignore
index 69bda67..8ab848c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,3 @@
-xinit-1.0.2.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog
diff --git a/xinput.sh b/xinput.sh
index 785963a..43a9731 100644
--- a/xinput.sh
+++ b/xinput.sh
@@ -10,6 +10,9 @@
 #
 # X Input method setup script
 
+USER_XINPUTRC="$HOME/.xinputrc"
+SYS_XINPUTRC="/etc/X11/xinit/xinputrc"
+
 # Load up the user and system locale settings
 oldterm=$TERM
 unset TERM
@@ -20,18 +23,14 @@ fi
 
 tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8"}}
 
-## try to source ~/.xinput.d/ll_CC or /etc/X11/xinit/xinput.d/ll_CC to
-## setup the input method for locale (CC is needed for Chinese for example)
 # unset env vars to be safe
 unset XIM XIM_PROGRAM XIM_ARGS XMODIFIERS GTK_IM_MODULE QT_IM_MODULE
-lang_region=$(echo $tmplang | sed -e 's/\..*//')
-for f in $HOME/.xinput.d/${lang_region} \
-	    $HOME/.xinput.d/default \
-	    /etc/X11/xinit/xinput.d/${lang_region} \
-	    /etc/X11/xinit/xinput.d/default ; do
-    [ -r $f ] && source $f && break
-done
-unset lang_region
+
+if [ -r "$USER_XINPUTRC" ]; then
+    source "$USER_XINPUTRC"
+elif [ -r "$SYS_XINPUTRC" ]; then
+    source "$SYS_XINPUTRC"
+fi
 
 [ -n "$GTK_IM_MODULE" ] && export GTK_IM_MODULE
 [ -n "$QT_IM_MODULE" ] && export QT_IM_MODULE
diff --git a/xorg-x11-xinit.spec b/xorg-x11-xinit.spec
index bb6974c..26419b6 100644
--- a/xorg-x11-xinit.spec
+++ b/xorg-x11-xinit.spec
@@ -4,7 +4,7 @@
 Summary: X.Org X11 X Window System xinit startup scripts
 Name: xorg-x11-%{pkgname}
 Version: %{xinitver}
-Release: 4
+Release: 5%{?dist}
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
@@ -96,6 +96,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xinit.1x*
 
 %changelog
+* Wed Jul 05 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-5.fc6
+- Implemented changes to xinput.sh based on suggestions from (#194458)
+
 * Wed Jun 21 2006 Mike A. Harris <mharris@redhat.com> 1.0.2-4
 - Added documentation to doc macro.