diff -up pocl-0.12/cmake/LLVM.cmake.orig pocl-0.12/cmake/LLVM.cmake
--- pocl-0.12/cmake/LLVM.cmake.orig	2015-10-26 15:09:27.000000000 +0100
+++ pocl-0.12/cmake/LLVM.cmake	2016-02-23 13:35:59.682678729 +0100
@@ -36,6 +36,7 @@ else()
   # search for any version
   find_program(LLVM_CONFIG
     NAMES "llvm-config"
+      "llvm-config-mp-3.8" "llvm-config-3.8" "llvm-config38"
       "llvm-config-mp-3.7" "llvm-config-3.7" "llvm-config37"
       "llvm-config-mp-3.6" "llvm-config-3.6" "llvm-config36"
       "llvm-config-mp-3.5" "llvm-config-3.5" "llvm-config35"
@@ -160,6 +161,8 @@ if(LLVM_VERSION MATCHES "3[.]([0-9]+)")
     set(LLVM_3_6 1)
   elseif(LLVM_MINOR STREQUAL "7")
     set(LLVM_3_7 1)
+  elseif(LLVM_MINOR STREQUAL "8")
+    set(LLVM_3_8 1)
   else()
     message(FATAL_ERROR "Unknown/unsupported minor llvm version: ${LLVM_MINOR}")
   endif()
diff -up pocl-0.12/config.h.in.cmake.orig pocl-0.12/config.h.in.cmake
--- pocl-0.12/config.h.in.cmake.orig	2015-10-26 15:09:27.000000000 +0100
+++ pocl-0.12/config.h.in.cmake	2016-02-23 13:34:14.120205521 +0100
@@ -95,6 +95,9 @@
 /* "Using LLVM 3.7" */
 #cmakedefine LLVM_3_7
 
+/* "Using LLVM 3.8" */
+#cmakedefine LLVM_3_8
+
 
 /* Defined to greatest expected alignment for extended types, in bytes. */
 #define MAX_EXTENDED_ALIGNMENT @MAX_EXTENDED_ALIGNMENT@
diff -up pocl-0.12/configure.ac.orig pocl-0.12/configure.ac
--- pocl-0.12/configure.ac.orig	2016-02-23 13:34:14.120205521 +0100
+++ pocl-0.12/configure.ac	2016-02-23 13:35:34.600566293 +0100
@@ -118,10 +118,14 @@ case "$LLVM_VERSION" in
      AC_DEFINE([LLVM_3_7], [], "Using LLVM svn, upcoming 3.7")
      LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
    ;;
+     3.8*)
+     AC_DEFINE([LLVM_3_8], [], "Using LLVM 3.8")
+     LLVM_LDFLAGS="$LLVM_LDFLAGS `$LLVM_CONFIG --system-libs`"
+   ;;
      *)
    AC_MSG_ERROR(
    [
-Unsupported LLVM version. Please use LLVM version 3.2, 3.3, 3.4, 3.5, 3.6, 3.7.
+Unsupported LLVM version. Please use LLVM version 3.2, 3.3, 3.4, 3.5, 3.6, 3.7 or 3.8.
    ])
    LLVM_VERSION=
    ;;