diff --git a/.gitmodules b/.gitmodules
index c4ffadcbec..dfd4de8b34 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,7 @@
 	url = https://github.com/Mbed-TLS/mbedtls
 [submodule "packager/third_party/zlib/source"]
 	path = packager/third_party/zlib/source
-	url = https://github.com/joeyparrish/zlib
+	url = https://github.com/madler/zlib
 [submodule "packager/third_party/libpng/source"]
 	path = packager/third_party/libpng/source
 	url = https://github.com/glennrp/libpng
diff --git a/packager/third_party/zlib/CMakeLists.txt b/packager/third_party/zlib/CMakeLists.txt
index 60859d6246..527e8846b1 100644
--- a/packager/third_party/zlib/CMakeLists.txt
+++ b/packager/third_party/zlib/CMakeLists.txt
@@ -10,12 +10,11 @@
 # submodule in an unclean state.
 set(RENAME_ZCONF OFF)
 
+# Skip the building of zlib example apps and tests.
+set(ZLIB_BUILD_EXAMPLES OFF)
+
 # Don't install anything.
 set(SKIP_INSTALL_ALL ON)
 
-# The configuration for x64 assembly in zlib's CMakeLists.txt doesn't seem to
-# work, as the assembly files aren't in the repo for some reason.  So don't set
-# the AMD64 flag.
-
 # With these set in scope of this folder, load the library's own CMakeLists.txt.
 add_subdirectory(source)
diff --git a/packager/third_party/zlib/source b/packager/third_party/zlib/source
index 59acdd06fd..5c42a230b7 160000
--- a/packager/third_party/zlib/source
+++ b/packager/third_party/zlib/source
@@ -1 +1 @@
-Subproject commit 59acdd06fd89fee1f91a464373b1afd964f810a8
+Subproject commit 5c42a230b7b468dff011f444161c0145b5efae59