diff --git a/buildserver/config.buildserver.py b/buildserver/config.buildserver.py
index 496f83fa..31b33271 100644
--- a/buildserver/config.buildserver.py
+++ b/buildserver/config.buildserver.py
@@ -8,6 +8,7 @@ ndk_paths = {
     'r15c': "/home/vagrant/android-ndk/r15c",
     'r16b': "/home/vagrant/android-ndk/r16b",
     'r17b': "/home/vagrant/android-ndk/r17b",
+    'r18b': "/home/vagrant/android-ndk/r18b",
 }
 java_paths = {
     '8': "/usr/lib/jvm/java-8-openjdk-amd64",
diff --git a/buildserver/provision-android-ndk b/buildserver/provision-android-ndk
index 7a78d845..159ff95f 100644
--- a/buildserver/provision-android-ndk
+++ b/buildserver/provision-android-ndk
@@ -14,7 +14,7 @@ if [ ! -e $NDK_BASE/r10e ]; then
     mv android-ndk-r10e r10e
 fi
 
-for version in r11c r12b r13b r14b r15c r16b r17b; do
+for version in r11c r12b r13b r14b r15c r16b r17b r18b; do
     if [ ! -e ${NDK_BASE}/${version} ]; then
         unzip /vagrant/cache/android-ndk-${version}-linux-x86_64.zip > /dev/null
         mv android-ndk-${version} ${version}
diff --git a/examples/config.py b/examples/config.py
index 7e2be2e4..42ef3cd3 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -19,6 +19,7 @@
 #     'r15c': None,
 #     'r16b': None,
 #     'r17b': None,
+#     'r18b': None,
 # }
 
 # Directory to store downloaded tools in (i.e. gradle versions)
diff --git a/makebuildserver b/makebuildserver
index 41b42bf7..e7d82111 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -423,6 +423,8 @@ cachefiles = [
      'bcdea4f5353773b2ffa85b5a9a2ae35544ce88ec5b507301d8cf6a76b765d901'),
     ('https://dl.google.com/android/repository/android-ndk-r17b-linux-x86_64.zip',
      '5dfbbdc2d3ba859fed90d0e978af87c71a91a5be1f6e1c40ba697503d48ccecd'),
+    ('https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip',
+     '4f61cbe4bbf6406aa5ef2ae871def78010eed6271af72de83f8bd0b07a9fd3fd'),
 ]