diff -ruN /usr/ports/japanese/mozc-server/Makefile japanese/mozc-server/Makefile
--- /usr/ports/japanese/mozc-server/Makefile	2015-04-04 10:42:52.630695336 +0900
+++ japanese/mozc-server/Makefile	2015-04-07 18:21:53.371933643 +0900
@@ -9,7 +9,7 @@
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-MAINTAINER=	hrs@FreeBSD.org
+MAINTAINER?=	hrs@FreeBSD.org
 COMMENT?=	Mozc Japanese Input Method, Server
 
 LICENSE=	BSD3CLAUSE
@@ -251,6 +251,60 @@
 	    ${STAGEDIR}${DATADIR}/icons/product_icon.png
 .endif
 
+# uim_mozc
+MACUIM_VERSION=	0.6.16.2
+.if ${BUILD_MOZC_LIST:Muim_mozc} == "uim_mozc" || make(makesum)
+MASTER_SITES+=	https://github.com/e-kato/macuim/archive/v${MACUIM_VERSION}.tar.gz?dummy=/:uim
+DISTFILES+=	macuim-${MACUIM_VERSION}.tar.gz:uim
+EXTRACT_ONLY+=  macuim-${MACUIM_VERSION}.tar.gz
+USES+=	tar:gz
+.endif
+.if ${BUILD_MOZC_LIST:Muim_mozc} == "uim_mozc"
+
+LIB_DEPENDS+=	libuim.so:${PORTSDIR}/textproc/uim
+GYP_OPTIONS+=	--noqt
+GYP_DEFINES+=	use_libibus=0 \
+		enable_gtk_renderer=0
+
+PLIST_FILES+=	lib/uim/plugin/libuim-mozc.so \
+		%%DATADIR%%/mozc.scm \
+		%%DATADIR%%/mozc-custom.scm \
+		%%DATADIR%%/mozc-key-custom.scm \
+		%%DATADIR%%/pixmaps/mozc.png \
+		"@exec uim-module-manager --register mozc" \
+		"@unexec uim-module-manager --unregister mozc"
+
+post-extract-uim_mozc:
+	${CP} -a ${WRKDIR}/macuim-${MACUIM_VERSION}/Mozc/uim ${WRKSRC}/unix
+	${REINPLACE_CMD} -e "s|/usr/lib/mozc/mozc_tool|${PREFIX}/bin/mozc_tool|g" \
+		${WRKDIR}/macuim-${MACUIM_VERSION}/Mozc/scm/mozc-custom.scm
+
+post-extract: post-extract-uim_mozc
+
+do-build-uim_mozc:
+	${BUILD_MOZC_CMD_BUILD} \
+		unix/uim/uim.gyp:uim-mozc
+
+do-install-uim_mozc:
+	${MKDIR} \
+		${STAGEDIR}${PREFIX}/lib/uim/plugin
+	${INSTALL_PROGRAM} \
+		${WRKSRC}/out_linux/${BUILD_MODE}/libuim-mozc.so \
+		${STAGEDIR}${PREFIX}/lib/uim/plugin/
+	${MKDIR} \
+		${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} \
+		${WRKDIR}/macuim-${MACUIM_VERSION}/Mozc/scm/mozc.scm \
+		${WRKDIR}/macuim-${MACUIM_VERSION}/Mozc/scm/mozc-custom.scm \
+		${WRKDIR}/macuim-${MACUIM_VERSION}/Mozc/scm/mozc-key-custom.scm \
+		${STAGEDIR}${DATADIR}/
+	${MKDIR} \
+		${STAGEDIR}${DATADIR}/pixmaps
+	${INSTALL_DATA} \
+	    ${WRKSRC}/data/images/product_icon_32bpp-128.png \
+	    ${STAGEDIR}${DATADIR}/pixmaps/mozc.png
+.endif
+
 # fcitx_mozc
 .if ${BUILD_MOZC_LIST:Mfcitx_mozc} == "fcitx_mozc" || make(makesum)
 PATCH_SITES=	http://download.fcitx-im.org/fcitx-mozc/
@@ -294,7 +348,7 @@
 post-extract: post-extract-fcitx_mozc
 
 post-patch-fcitx_mozc:
-	cd ${PATCH_WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-unix_fcitx_fcitx_mozc.cc 
+	cd ${PATCH_WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-unix_fcitx_fcitx_mozc.cc
 
 post-patch: post-patch-fcitx_mozc
 
diff -ruN /usr/ports/japanese/mozc-server/distinfo japanese/mozc-server/distinfo
--- /usr/ports/japanese/mozc-server/distinfo	2015-03-25 11:01:22.508542353 +0900
+++ japanese/mozc-server/distinfo	2015-04-07 18:16:45.449955800 +0900
@@ -4,5 +4,7 @@
 SIZE (ken_all-20130628.lzh) = 1735995
 SHA256 (jigyosyo-20130628.lzh) = d7b796d8643457d883de4a33cb3edf7455f11d778ea74d07b450ea10f3339cf7
 SIZE (jigyosyo-20130628.lzh) = 823590
+SHA256 (macuim-0.6.16.2.tar.gz) = 25fca78d1d76cc5c6a49f3b2f6981791ad8275abb2726334d8d40bd49498194d
+SIZE (macuim-0.6.16.2.tar.gz) = 324551
 SHA256 (fcitx-mozc-2.16.2037.102.2.patch) = ff175f3e0301c33f750780765ea264887827d00bc7a59fc8b55ae514ba449a1e
 SIZE (fcitx-mozc-2.16.2037.102.2.patch) = 140421