diff --git a/.travis.yml b/.travis.yml
index 93d48b4..c2f55e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+dist: bionic
 language: cpp
 cache: ccache
 sudo: false
@@ -5,39 +6,40 @@ sudo: false
 addons:
   apt:
     sources: &zeromq_source
-      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/ ./'
-        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/Release.key' 
+      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/ ./'
+        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/Release.key' 
     sources: &zeromq_source_and_toolchain_gcc
       - ubuntu-toolchain-r-test
-      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/ ./'
-        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/Release.key'     
-    sources: &zeromq_source_and_toolchain_clang_3-8
-      - llvm-toolchain-trusty-3.8
-      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/ ./'
-        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/Release.key'      
+      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/ ./'
+        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/Release.key'     
     sources: &zeromq_source_and_toolchain_clang_4-0
-      - llvm-toolchain-trusty-4.0
-      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/ ./'
-        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/Release.key'      
+      - llvm-toolchain-4.0
+      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/ ./'
+        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/Release.key'      
     sources: &zeromq_source_and_toolchain_clang_5-0
-      - llvm-toolchain-trusty-5.0
-      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/ ./'
-        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/Release.key'      
+      - llvm-toolchain-5.0
+      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/ ./'
+        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/Release.key'      
     sources: &zeromq_source_and_toolchain_clang_6-0
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-6.0
-      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/ ./'
-        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/Release.key'
+      - llvm-toolchain-6.0
+      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/ ./'
+        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/Release.key'
     sources: &zeromq_source_and_toolchain_clang_7
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-7
-      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/ ./'
-        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/Release.key'
+      - llvm-toolchain-7
+      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/ ./'
+        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/Release.key'
     sources: &zeromq_source_and_toolchain_clang_8
       - ubuntu-toolchain-r-test
-      - llvm-toolchain-trusty-8
-      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/ ./'
-        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_14.04/Release.key'
+      - llvm-toolchain-8
+      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/ ./'
+        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/Release.key'
+    sources: &zeromq_source_and_toolchain_clang_9
+      - ubuntu-toolchain-r-test
+      - llvm-toolchain-9
+      - sourceline: 'deb http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/ ./'
+        key_url: 'http://download.opensuse.org/repositories/network:/messaging:/zeromq:/release-stable/xUbuntu_18.04/Release.key'
     packages: &required_packages
       - cmake
       - libboost-dev
@@ -47,7 +49,7 @@ addons:
       - libboost-thread-dev
       - libxml2-dev
       - libpcap-dev
-      - libsystemd-journal-dev
+      - libsystemd-dev
       - libsctp-dev
     packages: &optional_packages
       - libssl-dev
@@ -95,16 +97,6 @@ matrix:
           packages:
             - *required_packages
             - *optional_packages
-    - compiler: gcc-5
-      env:
-        - DTLS="ON" ZMQ="ON" BUILD_TYPE="RelWithDebInfo" MATRIX_EVAL="CC=gcc-5 CXX=g++-5"
-      addons:
-        apt:
-          sources: *zeromq_source_and_toolchain_gcc
-          packages:
-            - *required_packages
-            - *optional_packages
-            - g++-5
     - compiler: gcc-6
       env:
         - DTLS="ON" ZMQ="ON" BUILD_TYPE="RelWithDebInfo" MATRIX_EVAL="CC=gcc-6 CXX=g++-6"
@@ -154,16 +146,6 @@ matrix:
           packages:
             - *required_packages
             - *optional_packages
-    - compiler: clang-3.8
-      env:
-        - DTLS="ON" ZMQ="ON" BUILD_TYPE="RelWithDebInfo" MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8"
-      addons:
-        apt:
-          sources: *zeromq_source_and_toolchain_clang_3-8
-          packages:
-            - *required_packages
-            - *optional_packages
-            - clang-3.8
     - compiler: clang-4.0
       env:
         - DTLS="ON" ZMQ="ON" BUILD_TYPE="RelWithDebInfo" MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0"
@@ -214,6 +196,16 @@ matrix:
             - *required_packages
             - *optional_packages
             - clang-8
+    - compiler: clang-9
+      env:
+        - DTLS="ON" ZMQ="ON" BUILD_TYPE="RelWithDebInfo" MATRIX_EVAL="CC=clang-9 && CXX=clang++-9"
+      addons:
+        apt:
+          sources: *zeromq_source_and_toolchain_clang_9
+          packages:
+            - *required_packages
+            - *optional_packages
+            - clang-9
     # - stage: Static Analysis
     #   env:
     #     - DTLS="ON" ZMQ="ON" BUILD_TYPE="RelWithDebInfo" MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"