diff --git a/.travis.yml b/.travis.yml
index a52280d2..b59b7a51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,12 +46,12 @@ matrix:
   - os: linux
     compiler: clang
     env:
-      - COMPILER=clang++-4.0
+      - COMPILER=clang++-5.0
       - SPECIAL=sanitizer
     addons:
       apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
-        packages: ['g++-6', 'clang-4.0']
+        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
+        packages: ['g++-6', 'clang-5.0']
     after_success:
       - make clang_sanitize -j4
 
@@ -251,17 +251,17 @@ matrix:
 
   - os: linux
     compiler: clang
-    env:
-      - COMPILER=clang++-4.0
-      - CXXFLAGS=-std=c++1z
+    env: COMPILER=clang++-5.0
     addons:
       apt:
-        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
-        packages: ['g++-6', 'clang-4.0']
+        sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
+        packages: ['g++-6', 'clang-5.0']
 
   - os: linux
     compiler: clang
-    env: COMPILER=clang++-5.0
+    env:
+      - COMPILER=clang++-5.0
+      - CXXFLAGS=-std=c++1z
     addons:
       apt:
         sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
diff --git a/README.md b/README.md
index 940b4ef0..8052f6bf 100644
--- a/README.md
+++ b/README.md
@@ -715,7 +715,7 @@ json j_from_msgpack = json::from_msgpack(v_msgpack);
 Though it's 2016 already, the support for C++11 is still a bit sparse. Currently, the following compilers are known to work:
 
 - GCC 4.9 - 7.1 (and possibly later)
-- Clang 3.4 - 4.0 (and possibly later)
+- Clang 3.4 - 5.0 (and possibly later)
 - Microsoft Visual C++ 2015 / Build Tools 14.0.25123.0 (and possibly later)
 - Microsoft Visual C++ 2017 / Build Tools 15.1.548.43366 (and possibly later)
 
@@ -750,6 +750,7 @@ The following compilers are currently used in continuous integration at [Travis]
 | Clang 3.8.0     | Ubuntu 14.04.5 LTS           | clang version 3.8.0-2ubuntu3~trusty5 (tags/RELEASE_380/final) |
 | Clang 3.9.1     | Ubuntu 14.04.5 LTS           | clang version 3.9.1-4ubuntu3~14.04.2 (tags/RELEASE_391/rc2) |
 | Clang 4.0.1     | Ubuntu 14.04.5 LTS           | clang version 4.0.1-svn305264-1~exp1 (branches/release_40) |
+| Clang 5.0.0     | Ubuntu 14.04.5 LTS           | clang version 5.0.0-svn310902-1~exp1 (branches/release_50) |
 | Clang Xcode 6.4 | Darwin Kernel Version 14.3.0 (OSX 10.10.3) | Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) |
 | Clang Xcode 7.3 | Darwin Kernel Version 15.0.0 (OSX 10.10.5) | Apple LLVM version 7.3.0 (clang-703.0.29) |
 | Clang Xcode 8.0 | Darwin Kernel Version 15.6.0 | Apple LLVM version 8.0.0 (clang-800.0.38) |