diff --git a/programming/build/llvm/pspec.xml b/programming/build/llvm/pspec.xml
index 4047e3d705..e21e882581 100644
--- a/programming/build/llvm/pspec.xml
+++ b/programming/build/llvm/pspec.xml
@@ -195,6 +195,7 @@
             <Dependency>glibc-32bit</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="executable">/usr/bin/llvm-config-32</Path>
             <Path fileType="library">/usr/lib32</Path>
         </Files>
     </Package>
diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py
index be8ef4a5a6..4306e795ad 100644
--- a/x11/library/mesa/actions.py
+++ b/x11/library/mesa/actions.py
@@ -6,6 +6,8 @@
 from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+
 
 Libdir = "/usr/lib32" if get.buildTYPE() == "emul32" else "/usr/lib"
 
@@ -17,7 +19,7 @@ def setup():
 
     options ="\
               --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-              --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
+              --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \
               --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
               --with-egl-platforms=x11,drm,wayland \
               --enable-xa \
@@ -34,24 +36,23 @@ def setup():
               --enable-xvmc \
               --enable-glx-tls \
               --enable-gallium-llvm \
+              --enable-nine \
               --enable-llvm-shared-libs \
               --enable-shared-glapi \
               --enable-texture-float \
              "
 
     if get.buildTYPE() == "emul32":
-        # compile with llvm doesn't work for now, test it later
+        shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
+        shelltools.export("LLVM_CONFIG","/usr/bin/llvm-config-32")        
         options += " --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-                     --with-gallium-drivers=r600,nouveau,swrast \
-                     --with-clang-libdir=/usr/lib32 \
-                     --disable-gallium-llvm \
-                     --disable-asm "
+                            --with-clang-libdir=/usr/lib32 \
+                            --disable-asm "
 
     elif get.ARCH() == "x86_64":
-
         options += " --with-clang-libdir=/usr/lib \
-                     --enable-opencl-icd \
-                   "
+                            --enable-omx \
+                            --enable-opencl-icd "
 
     autotools.configure(options)
     pisitools.dosed("libtool","( -shared )", " -Wl,--as-needed\\1")
diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml
index f43075ac1f..192b380655 100644
--- a/x11/library/mesa/pspec.xml
+++ b/x11/library/mesa/pspec.xml
@@ -62,7 +62,9 @@
             <Dependency>libdrm-nouveau</Dependency>
             <Dependency>wayland-client</Dependency>
             <Dependency>wayland-server</Dependency>
+            <Dependency>libomxil-bellagio</Dependency>
             <Dependency versionFrom="1.2">libxshmfence</Dependency>
+            <Dependency versionFrom="3.8.0">llvm</Dependency>
             <Dependency versionFrom="3.8.0">llvm-clang</Dependency>
             <Dependency versionFrom="3.8.0">llvm-libs</Dependency>
         </RuntimeDependencies>
@@ -109,6 +111,7 @@
         <Summary>32-bit shared libraries for mesa</Summary>
         <BuildType>emul32</BuildType>
         <BuildDependencies>
+            <Dependency>elfutils-32bit</Dependency>
             <Dependency>expat-32bit</Dependency>
             <Dependency>libXt-devel</Dependency>
             <Dependency>libXv-32bit</Dependency>
@@ -126,10 +129,13 @@
             <Dependency>libXxf86vm-32bit</Dependency>
             <Dependency>libdrm-intel-32bit</Dependency>
             <Dependency>libdrm-radeon-32bit</Dependency>
+            <Dependency>libdrm-amd-32bit</Dependency>
             <Dependency>libdrm-nouveau-32bit</Dependency>
             <Dependency>libxshmfence-32bit</Dependency>
+            <Dependency versionFrom="3.8.0">llvm-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
+            <Dependency>elfutils-32bit</Dependency>
             <Dependency>openssl-32bit</Dependency>
             <Dependency>alternatives</Dependency>
             <Dependency>glibc-32bit</Dependency>
@@ -140,7 +146,6 @@
             <Dependency>libdrm-32bit</Dependency>
             <Dependency>libxcb-32bit</Dependency>
             <Dependency>libXext-32bit</Dependency>
-            <Dependency>wayland-32bit</Dependency>
             <Dependency>libXfixes-32bit</Dependency>
             <Dependency>libXdamage-32bit</Dependency>
             <Dependency>libXxf86vm-32bit</Dependency>
@@ -149,9 +154,11 @@
             <Dependency>libdrm-intel-32bit</Dependency>
             <Dependency>libxshmfence-32bit</Dependency>
             <Dependency>libdrm-radeon-32bit</Dependency>
+            <Dependency>libdrm-amd-32bit</Dependency>
             <Dependency>libdrm-nouveau-32bit</Dependency>
             <Dependency>wayland-32bit</Dependency>
             <Dependency release="current">mesa</Dependency>
+            <Dependency versionFrom="3.8.0">llvm-32bit</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32</Path>
@@ -160,6 +167,7 @@
             <COMAR script="package-emul32.py">System.Package</COMAR>
         </Provides>
     </Package>
+    
     <History>
         <Update release="1">
             <Date>2016-03-28</Date>