diff --git a/fcitx.changes b/fcitx.changes
index e7b48fb..47eb899 100644
--- a/fcitx.changes
+++ b/fcitx.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sat Aug  9 05:33:21 UTC 2014 - i@marguerite.su
+
+- add baselibs.conf to SOURCE99
+
+-------------------------------------------------------------------
+Fri Aug  8 14:55:32 UTC 2014 - fcrozat@suse.com
+
+- Fix default category for fcitx (ensure it doesn't go to Other on
+  GNOME Classic)
+
+-------------------------------------------------------------------
+Tue Aug  5 16:22:59 UTC 2014 - schwab@suse.de
+
+- Build with RPM_OPT_FLAGS
+- Don't strip binaries
+
 -------------------------------------------------------------------
 Sat Jun  7 16:41:30 UTC 2014 - i@marguerite.su
 
diff --git a/fcitx.spec b/fcitx.spec
index 2bbfef4..9f2e5f7 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -34,6 +34,7 @@ Source7:        xinput-fcitx
 Source8:        openSUSE-themes.tar.gz
 Source9:        macros.%{name}
 Source10:       input.svgz
+Source99:		baselibs.conf
 BuildRequires:  cairo-devel
 %if 0%{?suse_version}
 BuildRequires:  dbus-1-devel
@@ -397,6 +398,9 @@ cd build
 
 # fix dlopen-ed library name
 cmake .. \
+		 -DCMAKE_C_FLAGS="$RPM_OPT_FLAGS" \
+		 -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" \
+		 -DCMAKE_VERBOSE_MAKEFILE=On \
 		 -DCMAKE_BUILD_TYPE=Release \
 		 -DOPENCC_LIBRARY_FILENAME=libopencc.so.1 \
 		 -DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \
@@ -452,7 +456,7 @@ sed -i "s/x-fskin/x-fskin;/" %{buildroot}%{_datadir}/applications/fcitx-skin-ins
 %if 0%{?suse_version}
 %suse_update_desktop_file  fcitx Utility DesktopUtility
 %suse_update_desktop_file  fcitx-skin-installer Utility DesktopUtility
-%suse_update_desktop_file  fcitx-configtool System X-SuSE-SystemSetup
+%suse_update_desktop_file -r fcitx-configtool System X-SuSE-SystemSetup
 %endif
 
 %if 0%{?fedora_version}
@@ -526,14 +530,6 @@ fdupes -n -q -r %{buildroot}
 %endif
 %endif
 
-# strip unnessary libraries
-%{__strip} %{buildroot}%{_libdir}/%{name}/*.so
-%{__strip} %{buildroot}%{_libdir}/libfcitx*.so.*
-%{__strip} %{buildroot}%{_libdir}/gtk-2.0/*/immodules/im-%{name}.so
-%if 0%{?suse_version} >= 1140 || 0%{?fedora_version}
-%{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so
-%endif
-
 %post gtk2
 %gtk2_immodule_post