diff --git a/baselibs.conf b/baselibs.conf
index 6e8519c..c65be78 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1 @@
-libSPIRV-Tools-suse2
+libSPIRV-Tools-suse3
diff --git a/gcc48.diff b/gcc48.diff
index 120778c..3e8a47c 100644
--- a/gcc48.diff
+++ b/gcc48.diff
@@ -14,10 +14,10 @@ were ignored.
  tools/io.h |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: spirv-tools-2016.7~g24/tools/io.h
+Index: spirv-tools-2016.7~g135/tools/io.h
 ===================================================================
---- spirv-tools-2016.7~g24.orig/tools/io.h
-+++ spirv-tools-2016.7~g24/tools/io.h
+--- spirv-tools-2016.7~g135.orig/tools/io.h
++++ spirv-tools-2016.7~g135/tools/io.h
 @@ -38,7 +38,8 @@ bool ReadFile(const char* filename, cons
          return false;
        }
diff --git a/spirv-tools-2016.7~g154.tar.xz b/spirv-tools-2016.7~g154.tar.xz
new file mode 100644
index 0000000..af9d624
--- /dev/null
+++ b/spirv-tools-2016.7~g154.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72cfa99edb8b069fb56c736e5fc9c5d580cda66bf7fc0f38b8ee51e1ac511982
+size 389740
diff --git a/spirv-tools-2016.7~g28.tar.xz b/spirv-tools-2016.7~g28.tar.xz
deleted file mode 100644
index 1f709f9..0000000
--- a/spirv-tools-2016.7~g28.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7ce1dce5afd44e9bc0e4dac165e2a929fb486276ea88e8e2e4b2b79813cff21b
-size 289760
diff --git a/spirv-tools.changes b/spirv-tools.changes
index 2167582..7e91d18 100644
--- a/spirv-tools.changes
+++ b/spirv-tools.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Tue Jul 18 09:01:25 UTC 2017 - jengelh@inai.de
+
+- Update to new snapshot 2016.7~g145
+  * Validation of type decls for SPV_KHR_16bit_storage
+  * Allow using FPRoundingMode when see VK_KHR_16bit_storage
+  * Validator parses and registers OpExtension
+  * Validator checks if operands require extension
+  * Validator dissallows unsupported Vulkan capability
+  * Update capability tests for SPV_KHR_16bit_storage rev 7
+  * Support SPV_AMD_gcn_shader
+  * Add FlattenDecoration transform
+  * Validator support for Variable Pointer extension.
+  * Support SPV_KHR_storage_buffer_storage_class
+  * Add SPIR-V 1.2 support, for OpenCL 2.2
+  * Added extension SPV_VALIDATOR_ignore_type_decl_unique
+  * Add support for SPV AMD extensions
+  * MARK-V decoder supports extended instructions
+  * DeadBranchElim: Improve algorithm to only remove blocks with
+    no predecessors
+  * Opt: Add new size-reduction passes to usage message.
+  * Add multi-sequence move-to-front implementation.
+  * Add MemPass, move all shared functions to it.
+  * Add CommonUniformElim pass.
+  * Mem2Reg: Allow Image and Sampler types as base target types.
+
 -------------------------------------------------------------------
 Mon Feb 20 15:48:52 UTC 2017 - jengelh@inai.de
 
diff --git a/spirv-tools.spec b/spirv-tools.spec
index 5a83bd5..84be379 100644
--- a/spirv-tools.spec
+++ b/spirv-tools.spec
@@ -16,11 +16,11 @@
 #
 
 
-%define version_unconverted 2016.7~g28
-%define lname libSPIRV-Tools-suse2
+%define version_unconverted 2016.7~g154
+%define lname libSPIRV-Tools-suse3
 
 Name:           spirv-tools
-Version:        2016.7~g28
+Version:        2016.7~g154
 Release:        0
 Summary:        API and commands for processing SPIR-V modules
 License:        Apache-2.0
@@ -76,11 +76,6 @@ make %{?_smp_mflags}
 %install
 b="%buildroot"
 %cmake_install
-# duh..
-if [ "%_lib" != lib ]; then
-	pushd "$b/%_prefix"
-	mv "lib" "%_lib"
-fi
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
@@ -93,11 +88,13 @@ fi
 %files -n %lname
 %defattr(-,root,root)
 %_libdir/libSPIRV-Tools.so.*
+%_libdir/libSPIRV-Tools-comp.so.*
 %_libdir/libSPIRV-Tools-opt.so.*
 
 %files devel
 %defattr(-,root,root)
 %_libdir/libSPIRV-Tools.so
+%_libdir/libSPIRV-Tools-comp.so
 %_libdir/libSPIRV-Tools-opt.so
 %_includedir/spirv-tools/
 
diff --git a/ver.diff b/ver.diff
index ca63756..045846d 100644
--- a/ver.diff
+++ b/ver.diff
@@ -4,31 +4,44 @@ Date: 2016-06-13 11:46:16.846841814 +0200
 Unversioned libraries suck!
 
 ---
- source/CMakeLists.txt     |    1 +
- source/opt/CMakeLists.txt |    1 +
- 2 files changed, 2 insertions(+)
+ source/CMakeLists.txt      |    1 +
+ source/comp/CMakeLists.txt |    1 +
+ source/opt/CMakeLists.txt  |    1 +
+ 3 files changed, 3 insertions(+)
 
-Index: spirv-tools-2016.7~g24/source/CMakeLists.txt
+Index: spirv-tools-2016.7~g154/source/CMakeLists.txt
 ===================================================================
---- spirv-tools-2016.7~g24.orig/source/CMakeLists.txt
-+++ spirv-tools-2016.7~g24/source/CMakeLists.txt
-@@ -219,6 +219,7 @@ set_source_files_properties(
+--- spirv-tools-2016.7~g154.orig/source/CMakeLists.txt
++++ spirv-tools-2016.7~g154/source/CMakeLists.txt
+@@ -281,6 +281,7 @@ set_source_files_properties(
    PROPERTIES OBJECT_DEPENDS "${SPIRV_TOOLS_BUILD_VERSION_INC}")
  
  add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
-+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse2)
++set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse3)
  spvtools_default_compile_options(${SPIRV_TOOLS})
  target_include_directories(${SPIRV_TOOLS}
    PUBLIC ${spirv-tools_SOURCE_DIR}/include
-Index: spirv-tools-2016.7~g24/source/opt/CMakeLists.txt
+Index: spirv-tools-2016.7~g154/source/comp/CMakeLists.txt
 ===================================================================
---- spirv-tools-2016.7~g24.orig/source/opt/CMakeLists.txt
-+++ spirv-tools-2016.7~g24/source/opt/CMakeLists.txt
-@@ -53,6 +53,7 @@ add_library(SPIRV-Tools-opt
+--- spirv-tools-2016.7~g154.orig/source/comp/CMakeLists.txt
++++ spirv-tools-2016.7~g154/source/comp/CMakeLists.txt
+@@ -13,6 +13,7 @@
+ # limitations under the License.
+ 
+ add_library(SPIRV-Tools-comp markv_codec.cpp)
++set_target_properties(SPIRV-Tools-comp PROPERTIES SOVERSION suse3)
+ 
+ spvtools_default_compile_options(SPIRV-Tools-comp)
+ target_include_directories(SPIRV-Tools-comp
+Index: spirv-tools-2016.7~g154/source/opt/CMakeLists.txt
+===================================================================
+--- spirv-tools-2016.7~g154.orig/source/opt/CMakeLists.txt
++++ spirv-tools-2016.7~g154/source/opt/CMakeLists.txt
+@@ -82,6 +82,7 @@ add_library(SPIRV-Tools-opt
    unify_const_pass.cpp
  )
  
-+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse2)
++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse3)
  spvtools_default_compile_options(SPIRV-Tools-opt)
  target_include_directories(SPIRV-Tools-opt
    PUBLIC ${spirv-tools_SOURCE_DIR}/include