diff --git a/common/shlibs b/common/shlibs
index 2827a7f83ce..1e2f8046849 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1939,7 +1939,7 @@ libqhull_r.so.7 libqhull-2015.2_1
 libqhull.so.7 libqhull-2015.2_1
 libKF5NetworkManagerQt.so.6 networkmanager-qt5-5.26.0_1
 libfcitx-core.so.0 libfcitx-4.2.8_1
-libfcitx-gclient.so.0 libfcitx-4.2.8_1
+libfcitx-gclient.so.1 libfcitx-4.2.9.5_1
 libfcitx-utils.so.0 libfcitx-4.2.8_1
 libfcitx-config.so.4 libfcitx-4.2.8_1
 libfcitx-qt.so.0 libfcitx-qt-4.2.8_1
diff --git a/srcpkgs/fcitx/patches/execinfo.patch b/srcpkgs/fcitx/patches/execinfo.patch
new file mode 100644
index 00000000000..aa00e4ac03b
--- /dev/null
+++ b/srcpkgs/fcitx/patches/execinfo.patch
@@ -0,0 +1,12 @@
+--- CMakeLists.txt.bak	2017-12-02 13:38:52.784843265 +0100
++++ src/CMakeLists.txt	2017-12-02 13:39:15.028841808 +0100
+@@ -1,6 +1,8 @@
+ include_directories(${LIBINTL_INCLUDE_DIR})
+ include_directories(${LIBICONV_INCLUDE_DIR})
+-include_directories(${LIBEXECINFO_INCLUDE_DIR})
++if(ENABLE_BACKTRACE)
++	include_directories(${LIBEXECINFO_INCLUDE_DIR})
++endif()
+ include_directories(${DL_INCLUDE_DIR})
+ include_directories(${PTHREAD_INCLUDE_DIR})
+ 
diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index a2821a1d7f1..15f2ffdf612 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,6 +1,6 @@
 # Template file for 'fcitx'
 pkgname=fcitx
-version=4.2.9.1
+version=4.2.9.5
 revision=1
 build_style=cmake
 short_desc="Flexible Context-aware Input Tool with eXtension"
@@ -8,9 +8,9 @@ maintainer="Robert La Spina <rkidlaspina@gmail.com>"
 license="GPL-2, LGPL-2.1"
 homepage="https://fcitx-im.org/"
 distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}_dict.tar.xz"
-checksum=5337c8226417a1d4e6f88b3b1048aa73695d281ed483568a7b6a9ee849ad6c77
+checksum=be398ac4433f6f4599d2728e20615e4f4602a5f67e9c29df4a3d4c1126d376ca
 
-hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules"
+hostmakedepends="pkg-config doxygen gobject-introspection extra-cmake-modules qt-qmake"
 makedepends="iso-codes gettext-devel enchant-devel libxml2-devel
  libxkbfile-devel icu-devel qt-devel dbus-devel gtk+-devel gtk+3-devel"
 lib32disabled=yes
@@ -18,13 +18,18 @@ configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
  -DENABLE_GTK2_IM_MODULE=ON -DENABLE_GTK3_IM_MODULE=ON -DENABLE_QT_IM_MODULE=ON
  -DFORCE_ENCHANT=ON"
 
+nocross="fcitx-scanner: cannot execute binary file: Exec format error"
+
 case "$XBPS_TARGET_MACHINE" in
-	*-musl)
-		# depends on libexecinfo
-		broken="https://travis-ci.org/ebfe/void-packages/jobs/116135672"
-	;;
+	*-musl) configure_args+=" -DENABLE_BACKTRACE=OFF";;
 esac
 
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" -DENABLE_GIR=OFF"
+	hostmakedepends+=" glib-devel qt-host-tools"
+fi
+
+
 libfcitx_package() {
 	short_desc+=" - shared libraries"
 	pkg_install() {
@@ -71,7 +76,6 @@ libfcitx-qt_package() {
 	short_desc+=" - Qt4 IM module"
 	pkg_install() {
 		vmove "usr/lib/libfcitx-qt.so.*"
-		vmove usr/lib/fcitx/qt
 		vmove usr/lib/fcitx/libexec/fcitx-qt-gui-wrapper
 		vmove usr/lib/qt
 	}