diff --git a/configure.ac b/configure.ac
index 48263fb..0701ffc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2156,8 +2156,15 @@ if test "x$MESA_LLVM" != x0; then
     LLVM_LIBS="`$LLVM_CONFIG --libs ${LLVM_COMPONENTS}`"
 
     if test "x$enable_llvm_shared_libs" = xyes; then
-        dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
-        LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
+        dnl Because changing output of config utility with every new release
+        dnl is the only sane option?
+        if test $LLVM_VERSION_MAJOR -eq 3 -a $LLVM_VERSION_MINOR -le 7; then
+            dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
+            LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
+        else
+            dnl We can use $LLVM_VERSION because there is no 'svn' in filename 
+            LLVM_SO_NAME=LLVM-"$LLVM_VERSION"
+        fi
         AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.so"], [llvm_have_one_so=yes])
 
         if test "x$llvm_have_one_so" = xyes; then