diff --git a/srcpkgs/mozc/template b/srcpkgs/mozc/template
index d8bacc2e42a..94e7e7a6225 100644
--- a/srcpkgs/mozc/template
+++ b/srcpkgs/mozc/template
@@ -1,9 +1,9 @@
 # Template file for 'mozc'
 pkgname=mozc
-version=2.20.2677.102
-revision=3
-hostmakedepends="ninja pkg-config protobuf-devel python qt5-devel"
-makedepends="gtk+-devel ibus-devel fcitx-devel libzinnia-devel protobuf-devel qt5-devel"
+version=2.23.2785.102
+revision=1
+hostmakedepends="ninja pkg-config protobuf-devel python"
+makedepends="gtk+-devel ibus-devel libzinnia-devel protobuf-devel qt5-devel"
 depends="tegaki-zinnia-japanese>=0.3"
 maintainer="Matthias von Faber <mvf@gmx.eu>"
 homepage="https://github.com/google/mozc"
@@ -12,24 +12,29 @@ short_desc="Japanese IME (Open Source version of Google Japanese Input)"
 build_wrksrc="mozc/src"
 create_wrksrc=yes
 distfiles="
- https://github.com/google/mozc/archive/fc687ac2266c54f0c2f58b4c482486618d68786f.tar.gz
+ https://github.com/fcitx/mozc/archive/44820a08db487fb1abe996f3ac2876457b05465d.tar.gz
  https://github.com/bnoordhuis/gyp/archive/4ec6c4e3a94bd04a6da2858163d40b2429b8aad1.tar.gz
  https://github.com/hiroyuki-komatsu/japanese-usage-dictionary/archive/e5b3425575734c323e1d947009dd74709437b684.tar.gz
- https://github.com/fcitx/mozc/archive/44820a08db487fb1abe996f3ac2876457b05465d.tar.gz
 "
 checksum="
- 04749ecfe9a2a039ccb6aae75baee04a7164682470fb9f272eedff803826a55d
+ a426856e617cdc8c95618cfd1d1884ad697ca3327bdc0a2d289a1d7a74170861
  009992eae3393ba7b2d2ba6249dbb3ac44157313f10e8add4d3086aef772c04b
  0b6efee0eebac2c1a8eeea333278aa40fcef7846bba9a379962c6e567e7e3dc1
- a426856e617cdc8c95618cfd1d1884ad697ca3327bdc0a2d289a1d7a74170861
 "
 
-post_extract() {
-	_mozc_orig=mozc-fc687ac2266c54f0c2f58b4c482486618d68786f
-	_mozc_fcitx=mozc-44820a08db487fb1abe996f3ac2876457b05465d
+if [ -n "$CROSS_BUILD" ]; then
+	hostmakedepends+=" qt5-devel"
+else
+	makedepends+=" fcitx-devel"
+fi
 
-	ln -s $_mozc_orig mozc
-	ln -sr $_mozc_fcitx/src/unix/fcitx mozc/src/unix/fcitx
+post_extract() {
+	ln -s mozc-* mozc
+	if [ -n "$CROSS_BUILD" ]; then
+		rm -rf mozc/src/unix/fcitx*
+	else
+		rm -rf mozc/src/unix/fcitx5
+	fi
 
 	# symlink "submodules" into place
 	for _src_dest in gyp japanese-usage-dictionary:japanese_usage_dictionary; do
@@ -47,18 +52,23 @@ do_configure() {
 }
 
 do_build() {
+	local targets
+	targets="
+	 server/server.gyp:mozc_server
+	 gui/gui.gyp:mozc_tool
+	 unix/emacs/emacs.gyp:mozc_emacs_helper
+	 unix/ibus/ibus.gyp:ibus_mozc
+	 renderer/renderer.gyp:mozc_renderer
+	"
+	if [ -z "$CROSS_BUILD" ]; then
+		targets+=" unix/fcitx/fcitx.gyp:fcitx-mozc"
+	fi
 	GYP_DEFINES="
 	 document_dir=/usr/share/licenses/${pkgname}
 	 use_libprotobuf=1
 	 use_libzinnia=1
 	" python build_mozc.py gyp --target_platform=Linux
-	python build_mozc.py build -c Release \
-	                     server/server.gyp:mozc_server \
-	                     gui/gui.gyp:mozc_tool \
-	                     unix/emacs/emacs.gyp:mozc_emacs_helper \
-	                     unix/ibus/ibus.gyp:ibus_mozc \
-			     unix/fcitx/fcitx.gyp:fcitx-mozc \
-	                     renderer/renderer.gyp:mozc_renderer
+	python build_mozc.py build -c Release $targets
 
 	sed -i 's|/usr/libexec/|/usr/lib/ibus-mozc/|g' out_linux/Release/gen/unix/ibus/mozc.xml
 }
@@ -96,12 +106,16 @@ emacs-mozc_package() {
 	}
 }
 
+if [ -z "$CROSS_BUILD" ]; then
 fcitx-mozc_package() {
-	short_desc="Mozc engine for Fcitx"
+	short_desc="Mozc engine for fcitx - Client of the Mozc input method"
 	depends="${sourcepkg}-${version}_${revision} fcitx>=4.2.9"
+	homepage="https://fcitx-im.org/"
+	license="GPL-2"
 	pkg_install() {
-		install -D -m 755 out_linux/Release/fcitx-mozc.so "${PKGDESTDIR}/usr/lib/fcitx/fcitx-mozc.so"
+		install -D -m 644 out_linux/Release/fcitx-mozc.so "${PKGDESTDIR}/usr/lib/fcitx/fcitx-mozc.so"
 		install -D -m 644 unix/fcitx/fcitx-mozc.conf "${PKGDESTDIR}/usr/share/fcitx/addon/fcitx-mozc.conf"
 		install -D -m 644 unix/fcitx/mozc.conf "${PKGDESTDIR}/usr/share/fcitx/inputmethod/mozc.conf"
 	}
 }
+fi