diff --git a/fcitx-mozc/PKGBUILD b/fcitx-mozc/PKGBUILD
index d9edc0ff0..22114d430 100644
--- a/fcitx-mozc/PKGBUILD
+++ b/fcitx-mozc/PKGBUILD
@@ -3,28 +3,28 @@
 ## Mozc compile option
 _bldtype=Release
 
-_mozc_rev=3306d3314499a54a4064b8b80bbc1bce3f6cfac4
+_mozc_rev=280e38fe3d9db4df52f0713acf2ca65898cd697a
 _japanese_usage_dictionary_rev=e5b3425575734c323e1d947009dd74709437b684
-_gyp_rev=e2e928bacd07fead99a18cb08d64cb24e131d3e5
-_protobuf_rev=172019c40bf548908ab09bfd276074c929d48415
-_zipcode_rel=201511
+_gyp_rev=920ee58c3d3109dea3cd37d88054014891a93db7
+_protobuf_rev=a428e42072765993ff674fda72863c9f1aa2d268
+_zipcode_rel=201703
 
 _pkgbase=mozc
 pkgname=fcitx-mozc
 pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
-pkgver=2.17.2313.102
-_fcitx_patchver=2.17.2313.102.1
+pkgver=2.20.2673.102
+_fcitx_patchver=2.18.2612.102.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://github.com/google/mozc"
 license=('custom')
-depends=('qt4' 'fcitx' 'zinnia')
+depends=('qt5-base' 'fcitx' 'zinnia')
 makedepends=('pkg-config' 'python2' 'curl' 'gtk2' 'mesa' 'subversion' 'ninja' 'git' 'clang')
 replaces=('mozc-fcitx')
 conflicts=('mozc' 'mozc-server' 'mozc-utils-gui' 'mozc-fcitx')
 source=(git+https://github.com/google/mozc.git#commit=${_mozc_rev}
         japanese_usage_dictionary::git+https://github.com/hiroyuki-komatsu/japanese-usage-dictionary.git#commit=${_japanese_usage_dictionary_rev}
-        git+https://chromium.googlesource.com/external/gyp#commit=${_gyp_rev}
+        mozc-gyp::git+https://chromium.googlesource.com/external/gyp#commit=${_gyp_rev}
         git+https://github.com/google/protobuf.git#commit=${_protobuf_rev}
         http://downloads.sourceforge.net/pnsft-aur/x-ken-all-${_zipcode_rel}.zip
         http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcode_rel}.zip
@@ -32,12 +32,16 @@ source=(git+https://github.com/google/mozc.git#commit=${_mozc_rev}
         http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz)
 sha512sums=('SKIP'
             'SKIP'
-            'bacb68bc64dd62322d332f38babf3c9933bf4a113081d795c8bc7e33a8e8e4e3e47320fd520f522c55830f519337c828c115ddb3275ace3076ebff4480b20805'
-            '9ebc0565366533ade36c5af19e47165641bb4d75393f87ba971e27d5bed038795731cb7426d769740ebf6cc3b91ca7c1f5cab200ac82097a3f880414a220d166'
-            'a9a3ca5dba636c84d216a0a3574e5132d0e6ca69e913ccd5f1a1716af238ea34d5100a4b5d42bbd0c12649780b6009f4533e848e86050e51c22dc8859badd615'
+            'SKIP'
+            'SKIP'
+            'aecd93a99c460fbbb9790bdf9e024a313b62cf51a1fec23bc19da0f375ddaeec37fe3bdf5d44930d16da9d1ba0b3205a2da008c4be611165ae474c469d173176'
+            'e426652cfa1ab6360c00770a76d12089165ba66364aaf8b6dcd3b6bf9fc7b154ec490eea77476eefd7e1551cf84165a45f165bb6cfab4964a1bb682220e11e28'
+            '725c464727f230707b90975705ef1565f1178f9144e66c5a688696a4ef520a6fec1d11f7aa68ee05f82aa9417060b1cccf49a155e30734871a525eaa4c76addb'
             '5507c637e5a65c44ccf6e32118b6d16647ece865171b9a77dd3c78e6790fbd97e6b219e68d2e27750e22074eb536bccf8d553c295d939066b72994b86b2f251a')
 
 prepare() {
+  mv mozc-gyp gyp
+
   cd mozc/src
 
   # Apply fcitx patch
@@ -50,7 +54,7 @@ prepare() {
 
   # Generate zip code seed
   msg "Generating zip code seed..."
-  python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/x-ken-all.csv" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
+  PYTHONPATH="$PWD:$PYTHONPATH" python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/x-ken-all.csv" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
   msg "Done."
 
   # Copy third party deps