diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,15 +1,22 @@
 name       : spirv-tools
-version    : 1.1
-release    : 1
+version    : 2016.7
+release    : 2
 source     :
-    - https://github.com/KhronosGroup/SPIRV-Tools/archive/spirv-1.1-rev1.tar.gz : c843441dd994b589ac23eac4b83826fe55c5823a7fcbbde6d61826494f6843b5
-license    : MIT
+    - git|https://github.com/KhronosGroup/SPIRV-Tools.git : abc6f5a67288b50846b9ef5f21a8100edd36d7c8
+license    : Apache-2.0
 component  : programming.tools
 summary    : The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.
 description: |
     The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.
+builddeps  :
+    - spirv-headers
 setup      : |
-    %cmake .
+    mkdir -p external/spirv-headers/include
+    pushd external/spirv-headers/include
+    ln -s /usr/include/spirv spirv
+    popd
+
+    %cmake . -DCMAKE_BUILD_TYPE=Release
 build      : |
     %make
 install    : |
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,10 +2,10 @@
     <Source>
         <Name>spirv-tools</Name>
         <Packager>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Packager>
-        <License>MIT</License>
+        <License>Apache-2.0</License>
         <PartOf>programming.tools</PartOf>
         <Summary xml:lang="en">The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.</Summary>
         <Description xml:lang="en">The SPIR-V Tools project provides an API and commands for processing SPIR-V modules.
@@ -29,20 +29,20 @@
 </Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="1">spirv-tools</Dependency>
+            <Dependency release="2">spirv-tools</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include/</Path>
-            <Path fileType="library">/usr/lib/lib*.a</Path>
+            <Path fileType="library">/usr/lib64/lib*.a</Path>
         </Files>
     </Package>
     <History>
-        <Update release="1">
-            <Date>2016-06-23</Date>
-            <Version>1.1</Version>
+        <Update release="2">
+            <Date>2017-07-22</Date>
+            <Version>2016.7</Version>
             <Comment>Packaging update</Comment>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Pierre-Yves</Name>
+            <Email>pyu@riseup.net</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file