diff --git a/.travis.yml b/.travis.yml
index b76a171..fbd7b53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,7 @@ env:
       - OS=ubuntu DIST=trusty
       - OS=ubuntu DIST=xenial
       - OS=ubuntu DIST=artful
+      - OS=ubuntu DIST=bionic
       - OS=debian DIST=wheezy
       - OS=debian DIST=jessie
       - OS=debian DIST=stretch
@@ -43,6 +44,7 @@ env:
       - OS=ubuntu DIST=trusty ARCH=i386
       - OS=ubuntu DIST=xenial ARCH=i386
       - OS=ubuntu DIST=artful ARCH=i386
+      - OS=ubuntu DIST=bionic ARCH=i386
       - OS=debian DIST=wheezy ARCH=i386
       - OS=debian DIST=jessie ARCH=i386
       - OS=debian DIST=stretch ARCH=i386
@@ -66,6 +68,8 @@ matrix:
       compiler: clang
     - env: OS=ubuntu DIST=artful
       compiler: clang
+    - env: OS=ubuntu DIST=bionic
+      compiler: clang
     - env: OS=debian DIST=wheezy
       compiler: clang
     - env: OS=debian DIST=jessie
@@ -80,6 +84,8 @@ matrix:
       compiler: clang
     - env: OS=ubuntu DIST=artful ARCH=i386
       compiler: clang
+    - env: OS=ubuntu DIST=bionic ARCH=i386
+      compiler: clang
     - env: OS=debian DIST=wheezy ARCH=i386
       compiler: clang
     - env: OS=debian DIST=jessie ARCH=i386
@@ -104,6 +110,8 @@ matrix:
       os: osx
     - env: OS=ubuntu DIST=artful
       os: osx
+    - env: OS=ubuntu DIST=bionic
+      os: osx
     - env: OS=debian DIST=wheezy
       os: osx
     - env: OS=debian DIST=jessie
diff --git a/scripts/buildpack.sh b/scripts/buildpack.sh
index e93c8d5..51b6866 100755
--- a/scripts/buildpack.sh
+++ b/scripts/buildpack.sh
@@ -54,6 +54,7 @@ distros_x86_64=(
     "ubuntu trusty x86_64"
     "ubuntu xenial x86_64"
     "ubuntu artful x86_64"
+    "ubuntu bionic x86_64"
     "debian wheezy x86_64"
     "debian jessie x86_64"
     "debian stretch x86_64"
@@ -63,6 +64,7 @@ distros_i386=(
     "ubuntu trusty i386"
     "ubuntu xenial i386"
     "ubuntu artful i386"
+    "ubuntu bionic i386"
     "debian wheezy i386"
     "debian jessie i386"
     "debian stretch i386"
@@ -73,6 +75,7 @@ distros_aarch64=(
     "fedora 26 aarch64"
     "fedora 27 aarch64"
     "ubuntu artful aarch64"
+    "ubuntu bionic aarch64"
     "ubuntu trusty aarch64"
     "ubuntu xenial aarch64"
     "debian jessie aarch64"