diff --git a/src/dictionary/gen_zip_code_seed.py b/src/dictionary/gen_zip_code_seed.py
index 77bffe1..646fb84 100644
--- a/src/dictionary/gen_zip_code_seed.py
+++ b/src/dictionary/gen_zip_code_seed.py
@@ -62,7 +62,7 @@
 ZIP_CODE_COST = 7000
 
 
-class ZipEntry (object):
+class ZipEntry(object):
   """Container class for zip code entry."""
 
   def __init__(self, zip_code, address):
@@ -153,10 +153,10 @@
 
 _SPECIAL_CASES = [
     SpecialMergeZip(u'5900111', u'大阪府', u'堺市中区', [u'三原台']),
-    SpecialMergeZip(u'8710046', u'大分県', u'中津市', [u'金谷',
-                                                       u'西堀端',
-                                                       u'東堀端',
-                                                       u'古金谷']),
+    SpecialMergeZip(u'8710046', u'大分県', u'中津市',
+                    [u'金谷', u'西堀端', u'東堀端', u'古金谷']),
+    SpecialMergeZip(u'9218046', u'石川県', u'金沢市',
+                    [u'大桑町', u'三小牛町']),
     ]
 
 
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index 3f27051..861e34e 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=16
-BUILD=2016
+BUILD=2017
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.