diff --git a/.travis.yml b/.travis.yml
index d97f3b21f..2ffa1b71a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -45,6 +45,12 @@ jobs:
       language: generic
       env:
         - MB_PYTHON_VERSION=3.8
+    - name: "3.9 macOS"
+      os: osx
+      osx_image: xcode9.3
+      language: generic
+      env:
+        - MB_PYTHON_VERSION=3.9
 
     - name: "3.7 Xenial"
       os: linux
@@ -64,6 +70,15 @@ jobs:
       env:
         - MB_PYTHON_VERSION=3.8
         - PLAT=i686
+    - name: "3.9 Xenial"
+      os: linux
+      env:
+        - MB_PYTHON_VERSION=3.9
+    - name: "3.9 Xenial 32-bit"
+      os: linux
+      env:
+        - MB_PYTHON_VERSION=3.9
+        - PLAT=i686
 
     - name: "3.6 macOS PyPy"
       os: osx
@@ -101,6 +116,14 @@ jobs:
         - MB_ML_VER=2014
         - MB_PYTHON_VERSION=3.8
         - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
+    - name: "3.9 Xenial aarch64"
+      os: linux
+      arch: arm64
+      env:
+        - PLAT=aarch64
+        - MB_ML_VER=2014
+        - MB_PYTHON_VERSION=3.9
+        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
 
     - name: "3.6 macOS latest"
       os: osx
@@ -141,6 +164,14 @@ jobs:
       env:
         - MB_PYTHON_VERSION=3.8
         - LATEST="true"
+    - name: "3.9 macOS latest"
+      os: osx
+      osx_image: xcode9.3
+      language: generic
+      if: tag IS blank
+      env:
+        - MB_PYTHON_VERSION=3.9
+        - LATEST="true"
 
     - name: "3.7 Xenial latest"
       os: linux
@@ -168,6 +199,19 @@ jobs:
         - MB_PYTHON_VERSION=3.8
         - PLAT=i686
         - LATEST="true"
+    - name: "3.9 Xenial latest"
+      os: linux
+      if: tag IS blank
+      env:
+        - MB_PYTHON_VERSION=3.9
+        - LATEST="true"
+    - name: "3.9 Xenial 32-bit latest"
+      os: linux
+      if: tag IS blank
+      env:
+        - MB_PYTHON_VERSION=3.9
+        - PLAT=i686
+        - LATEST="true"
 
     - name: "3.6 macOS PyPy latest"
       os: osx
@@ -217,6 +261,16 @@ jobs:
         - MB_PYTHON_VERSION=3.8
         - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
         - LATEST="true"
+    - name: "3.9 Xenial aarch64 latest"
+      os: linux
+      arch: arm64
+      if: tag IS blank
+      env:
+        - PLAT=aarch64
+        - MB_ML_VER=2014
+        - MB_PYTHON_VERSION=3.9
+        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
+        - LATEST="true"
 
 
 before_install:
diff --git a/config.sh b/config.sh
index d10ffdee6..7989e4601 100644
--- a/config.sh
+++ b/config.sh
@@ -33,7 +33,7 @@ function pre_build {
         BUILD_PREFIX=`dirname $(dirname $(which python))`
         PKG_CONFIG_PATH="$BUILD_PREFIX/lib/pkgconfig"
     fi
-    build_simple xcb-proto $LIBXCB_VERSION https://xcb.freedesktop.org/dist
+    build_simple xcb-proto 1.14-patched https://xcb.freedesktop.org/dist
     if [ -n "$IS_OSX" ]; then
         build_simple xproto 7.0.31 https://www.x.org/pub/individual/proto
         build_simple libXau 1.0.9 https://www.x.org/pub/individual/lib
diff --git a/multibuild b/multibuild
index c395b10e8..8882150df 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit c395b10e8395d43b51209760dc0853303ecfcd9e
+Subproject commit 8882150df6529658700b66bec124dfb77eefca26