diff --git a/.travis.yml b/.travis.yml
index cda956e38..a81521bb1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,6 +56,13 @@ matrix:
       env:
         - MB_PYTHON_VERSION=3.5
         - PLAT=i686
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.6
+    - os: linux
+      env:
+        - MB_PYTHON_VERSION=3.6
+        - PLAT=i686
     - os: osx
       language: generic
       env: MB_PYTHON_VERSION=2.7
@@ -73,6 +80,10 @@ matrix:
       language: generic
       env:
         - MB_PYTHON_VERSION=3.5
+    - os: osx
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=3.6
 
 before_install:
     - source multibuild/common_utils.sh
diff --git a/config.sh b/config.sh
index ddcf152a8..9ac546bf0 100644
--- a/config.sh
+++ b/config.sh
@@ -4,7 +4,7 @@
 # Package versions for fresh source builds
 FREETYPE_VERSION=2.6.5
 LIBPNG_VERSION=1.6.25
-ZLIB_VERSION=1.2.8
+ZLIB_VERSION=1.2.9
 JPEG_VERSION=9b
 OPENJPEG_VERSION=2.1
 TIFF_VERSION=4.0.6
diff --git a/multibuild b/multibuild
index db8f38459..93ec51083 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit db8f384596bbe436efdfa205f181f6c5209abbc4
+Subproject commit 93ec510830049fbf96f3ebaafdb3799b9e9b037d