diff --git a/ibus-xinput b/ibus-xinput
new file mode 100644
index 0000000..f5459ff
--- /dev/null
+++ b/ibus-xinput
@@ -0,0 +1,16 @@
+XIM=ibus
+XIM_PROGRAM="/usr/bin/ibus-daemon"
+ICON="ibus"
+XIM_ARGS="-r --xim"
+PREFERENCE_PROGRAM=/usr/bin/ibus-setup
+SHORT_DESC="IBus"
+GTK_IM_MODULE=ibus
+NOT_RUN=gnome3
+
+if test -f /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so || \
+   test -f /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so;
+then
+    QT_IM_MODULE=ibus
+else
+    QT_IM_MODULE=xim
+fi
diff --git a/ibus.spec b/ibus.spec
index a2b1874..3b5894f 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -30,23 +30,23 @@ License:    LGPLv2+
 Group:      System Environment/Libraries
 URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
-Source1:    xinput-ibus
+Source1:    %{name}-xinput
 %if %with_gjs
-Source2:    http://fujiwara.fedorapeople.org/ibus/gnome-shell/ibus-gjs-%{ibus_gjs_version}.tar.gz
+Source2:    http://fujiwara.fedorapeople.org/ibus/gnome-shell/%{name}-gjs-%{ibus_gjs_version}.tar.gz
 %endif
-Patch0:     ibus-HEAD.patch
-Patch1:     ibus-810211-no-switch-by-no-trigger.patch
-Patch2:     ibus-541492-xkb.patch
-Patch3:     ibus-530711-preload-sys.patch
-Patch4:     ibus-xx-setup-frequent-lang.patch
+Patch0:     %{name}-HEAD.patch
+Patch1:     %{name}-810211-no-switch-by-no-trigger.patch
+Patch2:     %{name}-541492-xkb.patch
+Patch3:     %{name}-530711-preload-sys.patch
+Patch4:     %{name}-xx-setup-frequent-lang.patch
 
 %if (0%{?fedora} <= 17 && 0%{?rhel} < 7)
 # Workaround to disable preedit on gnome-shell until bug 658420 is fixed.
 # https://bugzilla.gnome.org/show_bug.cgi?id=658420
-Patch92:    ibus-xx-g-s-disable-preedit.patch
+Patch92:    %{name}-xx-g-s-disable-preedit.patch
 %endif
 # Hide no nused properties in f17.
-Patch94:    ibus-xx-no-use.diff
+Patch94:    %{name}-xx-no-use.diff
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
diff --git a/xinput-ibus b/xinput-ibus
deleted file mode 100644
index f5459ff..0000000
--- a/xinput-ibus
+++ /dev/null
@@ -1,16 +0,0 @@
-XIM=ibus
-XIM_PROGRAM="/usr/bin/ibus-daemon"
-ICON="ibus"
-XIM_ARGS="-r --xim"
-PREFERENCE_PROGRAM=/usr/bin/ibus-setup
-SHORT_DESC="IBus"
-GTK_IM_MODULE=ibus
-NOT_RUN=gnome3
-
-if test -f /usr/lib/qt4/plugins/inputmethods/libqtim-ibus.so || \
-   test -f /usr/lib64/qt4/plugins/inputmethods/libqtim-ibus.so;
-then
-    QT_IM_MODULE=ibus
-else
-    QT_IM_MODULE=xim
-fi