diff --git a/app-i18n/mozc/mozc-2.23.2785.102.2.recipe b/app-i18n/mozc/mozc-2.23.2785.102.3.recipe
similarity index 82%
rename from app-i18n/mozc/mozc-2.23.2785.102.2.recipe
rename to app-i18n/mozc/mozc-2.23.2785.102.3.recipe
index d993ea109..afec8c148 100644
--- a/app-i18n/mozc/mozc-2.23.2785.102.2.recipe
+++ b/app-i18n/mozc/mozc-2.23.2785.102.3.recipe
@@ -6,7 +6,7 @@ COPYRIGHT="2010-2018 Google Inc."
 LICENSE="BSD (3-clause)"
 REVISION="1"
 SOURCE_URI="https://github.com/hanya/mozc/releases/download/v$portVersion/mozc-v$portVersion.tar.bz2"
-CHECKSUM_SHA256="da47e54a9f1d483766abfca2ba620c54ad1cd45008e25204051aaac740ff3f1a"
+CHECKSUM_SHA256="263d91081011f16b3b16a87cd679c6ee473fe57feb4d6e0e1ee992cc306a68b1"
 SOURCE_DIR="mozc"
 if [ "$effectiveTargetArchitecture" = x86 ]; then
 	PATCHES="mozc-$portVersion-x86.patch"
@@ -25,22 +25,14 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libprotobuf$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
 	"
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
-	devel:libGL$secondaryArchSuffix
 	devel:libprotobuf$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:g++$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
-	cmd:gyp
 	cmd:ninja
 	cmd:pkg_config$secondaryArchSuffix
 	cmd:protoc$secondaryArchSuffix
@@ -49,10 +41,6 @@ BUILD_PREREQUIRES="
 	cmd:xres
 	"
 
-USER_SETTINGS_FILES="
-	settings/mozc directory
-	"
-
 BUILD()
 {
 	cd src
@@ -62,7 +50,7 @@ BUILD()
 		zinnia_tomoe_dir=$sourceDir2/zinnia-tomoe-$zinniaTomoeVersion \
 		enable_gtk_renderer=0" \
 		$portPackageLinksDir/cmd~python2/bin/python2 build_mozc.py gyp \
-		--target_platform=Linux --variant=Haiku \
+		--target_platform=Linux --variant=Haiku --noqt \
 		--server_dir=$dataDir/mozc
 
 	$portPackageLinksDir/cmd~python2/bin/python2 build_mozc.py build \
@@ -70,7 +58,7 @@ BUILD()
 		server/server.gyp:mozc_server \
 		emacs/emacs.gyp:mozc_emacs_helper \
 		input_method/input_method.gyp:mozc \
-		gui/gui.gyp:mozc_tool \
+		haiku_gui/haiku_gui.gyp:mozc_tool_haiku \
 		zinnia_model/zinnia_model.gyp:zinnia_model
 }
 
@@ -80,20 +68,26 @@ INSTALL()
 	MozcDataDir=$dataDir/mozc
 	mkdir -p $MozcDataDir
 	mkdir -p $MozcDataDir/zinnia
+	mkdir -p $MozcDataDir/images
 	mkdir -p $dataDir/locale/catalogs/x-vnd.Mozc-InputMethod
+	mkdir -p $dataDir/locale/catalogs/x-vnd.Mozc-MozcTool
 	mkdir -p $addOnsDir/input_server/methods
 
 	cp $MozcOutDir/mozc $addOnsDir/input_server/methods/mozc
 
 	cp $MozcOutDir/mozc_server $MozcDataDir/mozc_server
-	cp $MozcOutDir/mozc_tool $MozcDataDir/mozc_tool
+	cp $MozcOutDir/mozc_tool_haiku $MozcDataDir/mozc_tool
 	cp $MozcOutDir/handwriting-ja.model \
 			$MozcDataDir/zinnia/handwriting-ja.model
 	cp $MozcOutDir/mozc_emacs_helper $MozcDataDir/mozc_emacs_helper
 	cp src/data/installer/credits_en.html $MozcDataDir/credits_en.html
+	cp src/data/images/product_icon_32bpp-128.png \
+			$MozcDataDir/images/product_icon_32bpp-128.png
 
 	cp $MozcOutDir/x-vnd.Mozc-InputMethod/* \
 		$dataDir/locale/catalogs/x-vnd.Mozc-InputMethod
+	cp $MozcOutDir/x-vnd.Mozc-MozcTool/* \
+		$dataDir/locale/catalogs/x-vnd.Mozc-MozcTool
 }
 
 TEST()
diff --git a/app-i18n/mozc/patches/mozc-2.23.2785.102.2-x86.patch b/app-i18n/mozc/patches/mozc-2.23.2785.102.3-x86.patch
similarity index 100%
rename from app-i18n/mozc/patches/mozc-2.23.2785.102.2-x86.patch
rename to app-i18n/mozc/patches/mozc-2.23.2785.102.3-x86.patch