diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py
index a7f9bc3b24..e2b2241d70 100644
--- a/x11/library/mesa/actions.py
+++ b/x11/library/mesa/actions.py
@@ -9,8 +9,10 @@ from pisi.actionsapi import pisitools
 
 Libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib"
 
-def setup():
+def setup():  
     autotools.autoreconf("-vif")
+    
+    pisitools.dosed("configure", "LLVM_SO_NAME=.*", "LLVM_SO_NAME=LLVM")
 
 # --enable-sysfs option provides better hardware information support with "lspci"
 # --enable-32-bit option is not present anymore. Although build fails in emul32. With --disable-asm option, not fail. Needs to be tested.
diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml
index f5cdad798b..5b4fd0e6c9 100644
--- a/x11/library/mesa/pspec.xml
+++ b/x11/library/mesa/pspec.xml
@@ -153,6 +153,13 @@
         </Provides>
     </Package>
     <History>
+         <Update release="21">
+            <Date>2015-11-10</Date>
+            <Version>10.5.5</Version>
+            <Comment>Rebuild for llvm.</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
         <Update release="20">
             <Date>2015-05-16</Date>
             <Version>10.5.5</Version>