diff --git a/src/DEPS b/src/DEPS
index 309940bb1..b8bbbbb9b 100644
--- a/src/DEPS
+++ b/src/DEPS
@@ -38,7 +38,7 @@ vars = {
   "wtl_revision": "587",
   "zinnia_revision": "16",
   "jsr305_version": "2.0.2",
-  "zlib_revision": "198222",
+  "zlib_revision": "50893291621658f355bc5b4d450a8d06a563053d",
   "japanese_usage_dictionary_revision": "10",
 }
 
@@ -87,7 +87,6 @@ deps_os = {
       "https://github.com/googlei18n/fonttools.git@" +
       Var("fonttools_revision"),
     "src/third_party/zlib/v1_2_8":
-      "https://src.chromium.org/chrome/trunk/src/third_party/zlib@" +
-      Var("zlib_revision"),
+      "https://github.com/madler/zlib.git@" + Var("zlib_revision"),
   },
 }
diff --git a/src/mozc_version_template.txt b/src/mozc_version_template.txt
index a30702606..6b58b3bfd 100644
--- a/src/mozc_version_template.txt
+++ b/src/mozc_version_template.txt
@@ -1,6 +1,6 @@
 MAJOR=2
 MINOR=17
-BUILD=2074
+BUILD=2075
 REVISION=102
 # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
 # downloaded by NaCl Mozc.
diff --git a/src/protobuf/protobuf.gyp b/src/protobuf/protobuf.gyp
index 1c5b8b202..d1e5c55d8 100644
--- a/src/protobuf/protobuf.gyp
+++ b/src/protobuf/protobuf.gyp
@@ -300,10 +300,8 @@
             ],
           },
           'cflags': [
-            '-Wno-error=uninitialized',
             '-Wno-implicit-function-declaration',
-            '-Wno-uninitialized',
-            '-Wno-unused-value',
+            '-Wno-incompatible-pointer-types-discards-qualifiers',
           ],
           'configurations': {
             'Debug_Base': {