diff --git a/chinese/fcitx/Makefile b/chinese/fcitx/Makefile
index 2eaf1b2..b003608 100644
--- a/chinese/fcitx/Makefile
+++ b/chinese/fcitx/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fcitx
-PORTVERSION=	4.2.8.6
-PORTREVISION=	1
+PORTVERSION=	4.2.9.1
 CATEGORIES=	chinese x11
 MASTER_SITES=	http://download.fcitx-im.org/fcitx/:fcitx \
 		http://download.fcitx-im.org/data/:data
@@ -21,9 +20,15 @@ COMMENT=	Flexible Input Method Framework
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes
-LIB_DEPENDS=	libdbus-1.so:devel/dbus \
-		libicuuc.so:devel/icu
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
+		${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake:devel/extra-cmake-modules
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libdbus-1.so:devel/dbus \
+		libicuuc.so:devel/icu \
+		libXfixes.so:x11/libXfixes \
+		libXinerama.so:x11/libXinerama \
+		libXrender.so:x11/libXrender \
+		libxkbcommon.so:x11/libxkbcommon
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 SUB_FILES=	pkg-message
@@ -40,9 +45,16 @@ INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=	GTK2 GTK3 QT4 OPENCC TPUNC DOCS
 OPTIONS_DEFAULT=GTK2 QT4
+OPTIONS_SUB=	yes
 
 GTK2_DESC=	Enable Gtk2 IM module
+GTK2_USE_GNOME=	gtk20
+GTK2_CMAKE_ON=	-DENABLE_GTK2_IM_MODULE=ON
+
 GTK3_DESC=	Enable Gtk3 IM module
+GTK3_USE_GNOME=	gtk30
+GTK3_CMAKE_ON=	-DENABLE_GTK3_IM_MODULE=ON
+
 QT4_DESC=	Enable Qt4 IM module
 OPENCC_DESC=	Enable OpenCC for Chinese Transform
 TPUNC_DESC=	Use traditional quotation marks
@@ -59,19 +71,14 @@ CMAKE_ARGS+=	-DENABLE_XDGAUTOSTART=OFF -DFORCE_ENCHANT=ON \
 		-DPREFIX=${PREFIX} \
 		-DQT_PLUGINS_DIR=${PREFIX}/lib/qt4/plugins
 
+
 .if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20
-PLIST_SUB+=	GTK2=""
 SUB_LIST+=	GTK2_IM=fcitx
 .else
-CMAKE_ARGS+=	-DENABLE_GTK2_IM_MODULE=OFF
-PLIST_SUB+=	GTK2="@comment "
 SUB_LIST+=	GTK2_IM=xim
 .endif
 
 .if ${PORT_OPTIONS:MGTK3}
-USE_GNOME+=	gtk30
-CMAKE_ARGS+=	-DENABLE_GTK3_IM_MODULE=ON
 PLIST_SUB+=	GTK3=""
 SUB_LIST+=	GTK3_IM=fcitx
 .else
diff --git a/chinese/fcitx/distinfo b/chinese/fcitx/distinfo
index 6f1743c..303e25f 100644
--- a/chinese/fcitx/distinfo
+++ b/chinese/fcitx/distinfo
@@ -1,5 +1,6 @@
-SHA256 (fcitx/fcitx-4.2.8.6.tar.xz) = 60cbaaf73d2a8b96b6e1c3772473f4fba5271521af7edbdacaed92ea284a125b
-SIZE (fcitx/fcitx-4.2.8.6.tar.xz) = 1664648
+TIMESTAMP = 1464749421
+SHA256 (fcitx/fcitx-4.2.9.1.tar.xz) = 25661907903e4ccaa4cf62cc389c006e280d31bce84147e203d7310fb4cd42ed
+SIZE (fcitx/fcitx-4.2.9.1.tar.xz) = 1655504
 SHA256 (fcitx/en_dict-20121020.tar.gz) = c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb
 SIZE (fcitx/en_dict-20121020.tar.gz) = 630491
 SHA256 (fcitx/pinyin.tar.gz) = 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1