diff --git a/x11/vulkan/spirv-llvm/actions.py b/x11/vulkan/spirv-llvm/actions.py
index 59f6c700fe..e73aea2cc6 100644
--- a/x11/vulkan/spirv-llvm/actions.py
+++ b/x11/vulkan/spirv-llvm/actions.py
@@ -6,14 +6,20 @@
 
 from pisi.actionsapi import cmaketools
 from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
+tools = "-DLLVM_BUILD_TOOLS=OFF" if get.buildTYPE() == "emul32" else "-DLLVM_BUILD_TOOLS=ON"
+
 def setup():
     cmaketools.configure("-DBUILD_SHARED_LIBS=ON \
                           -DCMAKE_BUILD_TYPE=Release \
                           -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
                           -DCMAKE_SKIP_RPATH=ON \
-                          -DLLVM_INCLUDE_TESTS=ON")
+                          -DLLVM_SPIRV_BUILD_EXTERNAL=YES \
+                          -DLLVM_INCLUDE_TESTS=ON \
+                          %s \
+                          -Wno-dev" %tools)
 
 def build():
     cmaketools.make()
diff --git a/x11/vulkan/spirv-llvm/pspec.xml b/x11/vulkan/spirv-llvm/pspec.xml
index 4d4f14ed9d..d50f214800 100644
--- a/x11/vulkan/spirv-llvm/pspec.xml
+++ b/x11/vulkan/spirv-llvm/pspec.xml
@@ -18,6 +18,7 @@
             <Dependency>python3-devel</Dependency>
             <Dependency>llvm-mlir</Dependency>
             <Dependency>llvm-libs</Dependency>
+            <Dependency>spirv-tools-devel</Dependency>
             <Dependency>libxml2-devel</Dependency>
             <Dependency>llvm-clang-devel</Dependency>
             <Dependency>python3-setuptools</Dependency>
@@ -35,6 +36,7 @@
         <RuntimeDependencies>
             <Dependency>llvm</Dependency>
             <Dependency>libgcc</Dependency>
+            <Dependency>spirv-tools</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
@@ -50,9 +52,11 @@
         <BuildDependencies>
             <Dependency>llvm-32bit</Dependency>
             <Dependency>libxml2-32bit</Dependency>
+            <Dependency>spirv-tools-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
-            <Dependency>llvm-32bit</Dependency>
+            <Dependency>llvm-32bit</Dependency>			
+            <Dependency>spirv-tools-32bit</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32</Path>
@@ -66,6 +70,7 @@
             <Dependency release="current">spirv-llvm</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="executable">/usr/bin</Path>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib/pkgconfig</Path>
             <Path fileType="library">/usr/lib32/pkgconfig</Path>