diff --git a/fcitx.changes b/fcitx.changes
index 8d94036..005fb14 100644
--- a/fcitx.changes
+++ b/fcitx.changes
@@ -1,3 +1,8 @@
+------------------------------------------------------------------
+Wed Oct  5 17:05:48 UTC 2011 - stecue@gmail.com
+
+- Fix a bug with d-bus. Thanks to hillwood and CSSlayer!
+
 ------------------------------------------------------------------
 Sun Oct  2 19:12:29 UTC 2011 - stecue@gmail.com
 
diff --git a/fcitx.spec b/fcitx.spec
index 580558a..9525ea2 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -2,9 +2,8 @@ Name:       fcitx
 Version:    4.1.2
 Release:    1
 Summary:    Free Chinese Input Toy for X
-Packager:   hillwood <hillwood@linuxfans.org>
 URL:        http://www.fcitx.org/
-Group:      System Environment/Libraries
+Group:      System/Libraries
 License:    GPL
 Source:    %{name}-%{version}_all.tar.bz2
 Source1:        xim.d-fcitx
@@ -13,6 +12,7 @@ Source3:        fcitx-README.suse
 Source4:        xim.fcitx.suse.template
 BuildRequires:  cairo-devel
 BuildRequires:  pango-devel
+BuildRequires:  fdupes
 %if 0%{?suse_version}
 BuildRequires:  dbus-1-devel
 BuildRequires:  dbus-1-glib-devel
@@ -45,9 +45,14 @@ Pinyin and QuWei input method. It's small and fast.
 Since version 4.1, FCITX itself can be use as an im-module. XIM
 can still be used but not necessary.
 
+Authors
+-------
+  Yuking
+  CSSlayer
+
 %package devel
 Summary:         Development files for %{name}
-Group:           Development/Libraries
+Group:           Development/Libraries/Other
 Requires:        fcitx = %{version}-%{release}
  
 %description devel
@@ -55,7 +60,7 @@ The %{name}-devel package includes the header files for the %{name} package.
  
 %package gtk2
 Summary:        Gtk2 IM Module for %{name}
-Group:          System Environment/Libraries
+Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
 #XIM is not necessary if using immodule-fcitx.
 #Requires:       gtk2-immodule-xim
@@ -66,7 +71,7 @@ This package contains %{name} im module for gtk2
 %if 0%{?suse_version} > 1130
 %package gtk3
 Summary:        Gtk3 IM Module for %{name}
-Group:          System Environment/Libraries
+Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
 #XIM is not necessary if using immodule-fcitx.
 #Requires:       gtk3-immodule-xim
@@ -78,7 +83,7 @@ This package contains %{name} im module for gtk3
 %if 0%{?fedora} > 14
 %package gtk3
 Summary:        Gtk3 IM Module for %{name}
-Group:          System Environment/Libraries
+Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
 Requires:       gtk3-immodule-xim
  
@@ -89,7 +94,7 @@ Requires:   fcitx
 
 %package qt4
 Summary:        Qt4 IM Module for %{name}
-Group:          System Environment/Libraries
+Group:          System/Libraries
 Requires:       %{name} = %{version}-%{release}
  
 %description qt4
@@ -159,7 +164,8 @@ cd ..
 %if 0%{?suse_version}
 %suse_update_desktop_file  fcitx Utility DesktopUtility
 %suse_update_desktop_file  fcitx-kimpanel Utility DesktopUtility
-%suse_update_desktop_file  fcitx-configtool System SystemSetup
+%suse_update_desktop_file  fcitx-configtool Utility DesktopUtility
+%suse_update_desktop_file  -G "Installer Script for Fcitx Skin" fcitx-skin-installer Utility DesktopUtility
 mkdir -p $RPM_BUILD_ROOT/etc/X11/xim.d/
 install -m 644 $RPM_SOURCE_DIR/xim.d-fcitx $RPM_BUILD_ROOT/etc/X11/xim.d/fcitx
 
@@ -178,10 +184,10 @@ popd
 mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/xinput.d/
 install -m 644 $RPM_SOURCE_DIR/xinput-fcitx.conf $RPM_BUILD_ROOT/etc/X11/xinit/xinput.d/fcitx.conf
 %endif
- 
+
+%fdupes -s %{buildroot}
 %find_lang %{name}
 
-#%fdupes -s %{buildroot}
 
 %clean
 [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT}
@@ -201,9 +207,9 @@ touch var/adm/SuSEconfig/run-gtk
 %post gtk3
 /sbin/ldconfig
  %ifarch x86_64
-  gtk-query-immodules-3.0-64 > /usr/lib64/gtk-3.0/3.0.0/immodules.cache
+  gtk-query-immodules-3.0-64 --update-cache 
  %else
-  gtk-query-immodules-3.0 > /usr/lib/gtk-3.0/3.0.0/immodules.cache
+  gtk-query-immodules-3.0 --update-cache
  %endif
 %endif
 
@@ -211,7 +217,7 @@ touch var/adm/SuSEconfig/run-gtk
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING INSTALL README
+%doc AUTHORS README
 %{_bindir}/*
 %{_datadir}/%{name}/addon/*
 %{_datadir}/%{name}/configdesc/*
@@ -247,7 +253,7 @@ touch var/adm/SuSEconfig/run-gtk
 %dir /etc/X11/xim.d
 %dir /etc/X11/xim.d/en
 %dir /etc/X11/xim.d/zh_CN
-/etc/X11/xim.d/*
+%config /etc/X11/xim.d/*
 %else
 %dir /etc/X11/xinit/xinput.d
 /etc/X11/xinit/xinput.d/fcitx.conf
diff --git a/xim.d-fcitx b/xim.d-fcitx
index 53d561c..80e9e2b 100644
--- a/xim.d-fcitx
+++ b/xim.d-fcitx
@@ -33,7 +33,7 @@ __END
     ;;
 esac
 
-
+eval `dbus-launch --sh-syntax --exit-with-session`
             export LC_CTYPE=$LANG
             # So you can use either zh_CN.UTF-8 or zh_CN.GB2312
             export XMODIFIERS="@im=fcitx"