diff --git a/cattleshed/compilers.default b/cattleshed/compilers.default
index e3e89e3d..9391cb7a 100644
--- a/cattleshed/compilers.default
+++ b/cattleshed/compilers.default
@@ -2029,6 +2029,74 @@
                 "LD_LIBRARY_PATH=/usr/local/gcc-4.8.2/lib64 /usr/local/llvm-head/bin/clang++ --version | head -1 | cut -d' ' -f3-"
             ]
         }, 
+        {
+            "switches": [
+                "warning", 
+                "optimize", 
+                "cpp-verbose", 
+                "boost-nothing", 
+                "boost-1.47", 
+                "boost-1.48", 
+                "boost-1.49", 
+                "boost-1.50", 
+                "boost-1.51", 
+                "boost-1.52", 
+                "boost-1.53", 
+                "boost-1.54", 
+                "boost-1.55", 
+                "boost-1.56", 
+                "boost-1.57", 
+                "boost-1.58", 
+                "boost-1.59", 
+                "boost-1.60", 
+                "sprout", 
+                "msgpack", 
+                "c++98", 
+                "gnu++98", 
+                "c++11", 
+                "gnu++11", 
+                "c++14", 
+                "gnu++14", 
+                "c++1z", 
+                "gnu++1z", 
+                "cpp-no-pedantic", 
+                "cpp-pedantic", 
+                "cpp-pedantic-errors"
+            ], 
+            "compile-command": [
+                "/usr/local/llvm-3.8/bin/run-clang++.sh", 
+                "-oprog.exe", 
+                "-fansi-escape-codes", 
+                "-fcolor-diagnostics", 
+                "-stdlib=libc++", 
+                "-I/usr/local/libcxx-3.8/include/c++/v1", 
+                "-L/usr/local/libcxx-3.8/lib", 
+                "-Wl,-rpath,/usr/local/libcxx-3.8/lib", 
+                "-nostdinc++", 
+                "-lpthread", 
+                "prog.cc", 
+                "-lsupc++"
+            ], 
+            "name": "clang-3.8", 
+            "language": "C++", 
+            "output-file": "prog.cc", 
+            "compiler-option-raw": true, 
+            "displayable": true, 
+            "run-command": "./prog.exe", 
+            "display-compile-command": "clang++ prog.cc -stdlib=libc++", 
+            "initial-checked": [
+                "warning", 
+                "gnu++1z", 
+                "boost-1.60", 
+                "cpp-no-pedantic"
+            ], 
+            "display-name": "clang", 
+            "version-command": [
+                "/bin/sh", 
+                "-c", 
+                "LD_LIBRARY_PATH=/usr/local/gcc-4.8.2/lib64 /usr/local/llvm-3.8/bin/clang++ --version | head -1 | cut -d' ' -f3-"
+            ]
+        }, 
         {
             "switches": [
                 "warning", 
diff --git a/cattleshed/compilers.py b/cattleshed/compilers.py
index 420e08ff..53638e4e 100644
--- a/cattleshed/compilers.py
+++ b/cattleshed/compilers.py
@@ -454,6 +454,31 @@ def make_clang(self):
                 },
                 "lsupc++": True,
             }),
+            ("clang-3.8", {
+                "params": {
+                    "llvm": "llvm-3.8",
+                    "libcxx": "libcxx-3.8",
+                },
+                "after": {
+                    "switches": SWITCHES_DEFAULT + SWITCHES_BOOST + ["sprout", "msgpack", "c++98", "gnu++98", "c++11", "gnu++11", "c++14", "gnu++14", "c++1z", "gnu++1z"] + SWITCHES_PEDANTIC,
+                    "initial-checked":["warning", "gnu++1z", "boost-1.60", "cpp-no-pedantic"],
+                    "compile-command":[
+                        "/usr/local/llvm-3.8/bin/run-clang++.sh",
+                        "-oprog.exe",
+                        "-fansi-escape-codes",
+                        "-fcolor-diagnostics",
+                        "-stdlib=libc++",
+                        "-I/usr/local/libcxx-3.8/include/c++/v1",
+                        "-L/usr/local/libcxx-3.8/lib",
+                        "-Wl,-rpath,/usr/local/libcxx-3.8/lib",
+                        "-nostdinc++",
+                        "-lpthread",
+                        "prog.cc"
+                    ],
+                    "version-command":["/bin/sh", "-c", "LD_LIBRARY_PATH=/usr/local/gcc-4.8.2/lib64 /usr/local/llvm-3.8/bin/clang++ --version | head -1 | cut -d' ' -f3-"],
+                },
+                "lsupc++": True,
+            }),
             ("clang-3.7", {
                 "params": {
                     "llvm": "llvm-3.7",