diff --git a/x11/vulkan/spirv-tools/actions.py b/x11/vulkan/spirv-tools/actions.py
index 62c22ff626..344ca0c85e 100755
--- a/x11/vulkan/spirv-tools/actions.py
+++ b/x11/vulkan/spirv-tools/actions.py
@@ -12,24 +12,27 @@ from pisi.actionsapi import get
 
 pisitools.cxxflags.add("-std=gnu++11")
 
+
 def setup():
   
-	shelltools.system("mv SPIRV-Headers-1.5.4.raytracing.fixed external/SPIRV-Headers")
-	
+	#shelltools.system("mv SPIRV-Headers-1.5.4.raytracing.fixed external/SPIRV-Headers")
+
 	if get.buildTYPE() == "emul32":
 		cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib32 \
 						      -DBUILD_SHARED_LIBS=ON \
 						      -DSPIRV_WERROR=Off \
+						      -DSPIRV-Headers_SOURCE_DIR=/usr \
 						      -DSKIP_SPIRV_TOOLS_INSTALL=OFF \
 						      -DCMAKE_INSTALL_BINDIR=bin32")
 	else:
 		cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \
 						      -DBUILD_SHARED_LIBS=ON \
-						      -DSPIRV_WERROR=Off")
+						      -DSPIRV-Headers_SOURCE_DIR=/usr \
+						      -DSPIRV_WERROR=OFF")
     
 
 def build():
-	cmaketools.make()
+    cmaketools.make()
     
 
 def install():
diff --git a/x11/vulkan/spirv-tools/files/spirv-tools-gcc11.patch b/x11/vulkan/spirv-tools/files/spirv-tools-gcc11.patch
new file mode 100644
index 0000000000..f5c82da085
--- /dev/null
+++ b/x11/vulkan/spirv-tools/files/spirv-tools-gcc11.patch
@@ -0,0 +1,13 @@
+diff --git a/source/diagnostic.cpp b/source/diagnostic.cpp
+index edc27c8..77c29d7 100644
+--- a/source/diagnostic.cpp
++++ b/source/diagnostic.cpp
+@@ -37,7 +37,7 @@ spv_diagnostic spvDiagnosticCreate(const spv_position position,
+   diagnostic->position = *position;
+   diagnostic->isTextSource = false;
+   memset(diagnostic->error, 0, length);
+-  strncpy(diagnostic->error, message, length);
++  memcpy(diagnostic->error, message, length);
+   return diagnostic;
+ }
+ 
diff --git a/x11/vulkan/spirv-tools/pspec.xml b/x11/vulkan/spirv-tools/pspec.xml
index 22c0efea11..02690c1996 100755
--- a/x11/vulkan/spirv-tools/pspec.xml
+++ b/x11/vulkan/spirv-tools/pspec.xml
@@ -13,11 +13,15 @@
         <Summary>API and commands for processing SPIR-V modules</Summary>
         <Description>API and commands for processing SPIR-V modules</Description>
         <Archive sha1sum="d5cb466155341b927db52b2f16710694c1716eaa" type="targz">https://github.com/KhronosGroup/SPIRV-Tools/archive/v2021.2.tar.gz</Archive>
-        <Archive sha1sum="49657f53dd391ab9dad0cb1ce47001d673a2c7ab" type="targz" target="SPIRV-Tools-2021.2">https://github.com/KhronosGroup/SPIRV-Headers/archive/1.5.4.raytracing.fixed.tar.gz</Archive>
+<!--         <Archive sha1sum="49657f53dd391ab9dad0cb1ce47001d673a2c7ab" type="targz" target="SPIRV-Tools-2021.2">https://github.com/KhronosGroup/SPIRV-Headers/archive/1.5.4.raytracing.fixed.tar.gz</Archive> -->
         <BuildDependencies>
-        <Dependency>cmake</Dependency>
+            <Dependency>cmake</Dependency>
+            <Dependency>spirv-headers</Dependency>
             <Dependency>python3-devel</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch level="1">spirv-tools-gcc11.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>