diff --git a/pisi-index.xml b/pisi-index.xml
index fd1632db31..c4d3a037f1 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -26015,6 +26015,58 @@
             </Update>
         </History>
     </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>spirv-tools</Name>
+            <Homepage>https://www.khronos.org/vulkan/</Homepage>
+            <Packager>
+                <Name>Idris Kalp</Name>
+                <Email>idriskalp@gmail.com</Email>
+            </Packager>
+            <License>BSD</License>
+            <IsA>library</IsA>
+            <PartOf>x11.vulkan</PartOf>
+            <Summary xml:lang="en">API and commands for processing SPIR-V modules</Summary>
+            <Description xml:lang="en">API and commands for processing SPIR-V modules</Description>
+            <Archive type="targz" sha1sum="9c4b44c23ee35f38324774dfd019925b866852aa" name="v2019.4.tar.gz">https://github.com/KhronosGroup/SPIRV-Tools/archive/v2019.4.tar.gz</Archive>
+            <Archive type="targz" sha1sum="e7911f27a13c61e9d8c13fe7b0df5f1a883e972e" target="SPIRV-Tools-2019.4" name="1.5.1.corrected.tar.gz">https://github.com/KhronosGroup/SPIRV-Headers/archive/1.5.1.corrected.tar.gz</Archive>
+            <SourceURI>x11/vulkan/spirv-tools/pspec.xml</SourceURI>
+        </Source>
+        <Package>
+            <Name>spirv-tools</Name>
+            <Files>
+                <Path fileType="executable">/usr/bin</Path>
+                <Path fileType="library">/usr/lib</Path>
+                <Path fileType="data">/usr/share</Path>
+                <Path fileType="doc">/usr/share/doc</Path>
+            </Files>
+        </Package>
+        <Package>
+            <Name>spirv-tools-32bit</Name>
+            <PartOf>emul32</PartOf>
+            <BuildType>emul32</BuildType>
+            <Files>
+                <Path fileType="library">/usr/lib32</Path>
+            </Files>
+        </Package>
+        <Package>
+            <Name>spirv-tools-devel</Name>
+            <Files>
+                <Path fileType="header">/usr/include</Path>
+                <Path fileType="data">/usr/lib/pkgconfig</Path>
+                <Path fileType="data">/usr/lib32/pkgconfig</Path>
+            </Files>
+        </Package>
+        <History>
+            <Update release="1">
+                <Date>220-01-11</Date>
+                <Version>2019.4</Version>
+                <Comment>First release</Comment>
+                <Name>Idris Kalp</Name>
+                <Email>idriskalp@gmail.com</Email>
+            </Update>
+        </History>
+    </SpecFile>
     <SpecFile>
         <Source>
             <Name>glslang</Name>
diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum
index 86c231c8a5..f1943e731e 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1 @@
-d02848ceaa64fcd3cc4388f597231ee94c038d3a
\ No newline at end of file
+dcaa5614c300b781609fc35b06d8eb28aae21ff5
\ No newline at end of file
diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz
index 83ac1ec6f3..1b643fbb4e 100644
Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ
diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum
index 909bdcb9a4..4eb74ee0f6 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1 @@
-26b146d34c2255265e21d029937519ece2268e56
\ No newline at end of file
+81372ce72429491e13325a759a60a9748654cd93
\ No newline at end of file
diff --git a/x11/vulkan/spirv-tools/actions.py b/x11/vulkan/spirv-tools/actions.py
new file mode 100755
index 0000000000..8250a6ef3e
--- /dev/null
+++ b/x11/vulkan/spirv-tools/actions.py
@@ -0,0 +1,41 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import cmaketools
+from pisi.actionsapi import autotools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import get
+
+pisitools.cxxflags.add("-std=gnu++11")
+
+def setup():
+  
+	shelltools.system("mv SPIRV-Headers-1.5.1.corrected external/SPIRV-Headers")
+	
+	if get.buildTYPE() == "emul32":
+		cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib32 \
+						      -DBUILD_SHARED_LIBS=ON \
+						      -DSPIRV_WERROR=Off \
+						      -DSKIP_SPIRV_TOOLS_INSTALL=OFF \
+						      -DCMAKE_INSTALL_BINDIR=bin32")
+	else:
+		cmaketools.configure("-DCMAKE_INSTALL_LIBDIR=lib \
+						      -DBUILD_SHARED_LIBS=ON \
+						      -DSPIRV_WERROR=Off")
+    
+
+def build():
+	cmaketools.make()
+    
+
+def install():
+	autotools.rawInstall("DESTDIR=%s" %get.installDIR())
+	if get.buildTYPE() == "emul32":
+		pisitools.removeDir("/usr/bin32")
+	
+
+	pisitools.dodoc("LICENSE", "README.md", "CONTRIBUTING.md")
diff --git a/x11/vulkan/spirv-tools/pspec.xml b/x11/vulkan/spirv-tools/pspec.xml
new file mode 100755
index 0000000000..5f7f137cc5
--- /dev/null
+++ b/x11/vulkan/spirv-tools/pspec.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>spirv-tools</Name>
+        <Homepage>https://www.khronos.org/vulkan/</Homepage>
+        <Packager>
+            <Name>Idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Packager>
+        <License>BSD</License>
+        <IsA>library</IsA>
+        <Summary>API and commands for processing SPIR-V modules</Summary>
+        <Description>API and commands for processing SPIR-V modules</Description>
+        <Archive sha1sum="9c4b44c23ee35f38324774dfd019925b866852aa" type="targz">https://github.com/KhronosGroup/SPIRV-Tools/archive/v2019.4.tar.gz</Archive>
+		<Archive sha1sum="e7911f27a13c61e9d8c13fe7b0df5f1a883e972e" type="targz" target="SPIRV-Tools-2019.4">https://github.com/KhronosGroup/SPIRV-Headers/archive/1.5.1.corrected.tar.gz</Archive>
+    </Source>
+
+    <Package>
+        <Name>spirv-tools</Name>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+			<Path fileType="library">/usr/lib</Path>
+            <Path fileType="data">/usr/share</Path>
+			<Path fileType="doc">/usr/share/doc</Path>
+        </Files>
+    </Package>
+	
+	<Package>
+        <Name>spirv-tools-32bit</Name>
+		<BuildType>emul32</BuildType>
+		<PartOf>emul32</PartOf>
+        <Files>
+			<Path fileType="library">/usr/lib32</Path>
+        </Files>
+    </Package>
+    
+     <Package>
+        <Name>spirv-tools-devel</Name>
+        <Files>
+			<Path fileType="header">/usr/include</Path>
+			<Path fileType="data">/usr/lib/pkgconfig</Path>
+			<Path fileType="data">/usr/lib32/pkgconfig</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="1">
+            <Date>220-01-11</Date>
+            <Version>2019.4</Version>
+            <Comment>First release</Comment>
+            <Name>Idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
+    </History>
+</PISI>