diff --git a/_service b/_service
deleted file mode 100644
index 161a6e0..0000000
--- a/_service
+++ /dev/null
@@ -1,16 +0,0 @@
-<services>
-	<service name="tar_scm" mode="disabled">
- 		<param name="scm">git</param>
-		<param name="url">https://github.com/KhronosGroup/SPIRV-Tools</param>
-		<param name="filename">spirv-tools</param>
-		<param name="revision">v2020.1</param>
-		<param name="parent-tag">v2020.1</param>
-		<param name="versionformat">2020.1</param>
-	</service>
-	<service name="recompress" mode="disabled">
-		<param name="file">*.tar</param>
-		<param name="compression">xz</param>
-	</service>
-	<service name="set_version" mode="disabled"/>
-	<!-- remove directory windows*/ because of vcredist -->
-</services>
diff --git a/baselibs.conf b/baselibs.conf
index a252de7..4e6b556 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,4 +1,4 @@
-libSPIRV-Tools-suse16
+libSPIRV-Tools-suse17
 spirv-tools-devel
 	requires -spirv-tools-<targettype>
-	requires "libSPIRV-Tools-suse16-<targettype> = <version>"
+	requires "libSPIRV-Tools-suse17-<targettype> = <version>"
diff --git a/spirv-tools.changes b/spirv-tools.changes
index 65f36d0..b8eab9d 100644
--- a/spirv-tools.changes
+++ b/spirv-tools.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr  8 11:21:33 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2020.2
+  * Support extended instructions in the vscode language server.
+  * Make spvOpcodeString part of the public API.
+  * Add support for KHR_ray_{query,tracing} extensions.
+  * Add validation support for SPV_AMD_shader_image_load_store_lod.
+
 -------------------------------------------------------------------
 Thu Feb 20 10:10:56 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/spirv-tools.spec b/spirv-tools.spec
index 907b9c8..9dad8c6 100644
--- a/spirv-tools.spec
+++ b/spirv-tools.spec
@@ -17,10 +17,10 @@
 
 
 %define version_unconverted 2020.1
-%define lname libSPIRV-Tools-suse16
+%define lname libSPIRV-Tools-suse17
 
 Name:           spirv-tools
-Version:        2020.1
+Version:        2020.2
 Release:        0
 Summary:        API and commands for processing SPIR-V modules
 License:        Apache-2.0
@@ -31,14 +31,13 @@ Source:         https://github.com/KhronosGroup/SPIRV-Tools/archive/v%version.ta
 Source9:        baselibs.conf
 Patch1:         ver.diff
 Patch2:         gcc48.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 BuildRequires:  python3-base
 BuildRequires:  python3-xml
-BuildRequires:  spirv-headers >= 1.5.1.corrected
+BuildRequires:  spirv-headers >= 1.5.1.corrected+git24
 
 %description
 The package includes an assembler, binary module parser,
diff --git a/v2020.1.tar.gz b/v2020.1.tar.gz
deleted file mode 100644
index 92999c2..0000000
--- a/v2020.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1eaa5e09c638d7113b60d825e6ce44406b35031be68db894a016b5faf45de568
-size 2053947
diff --git a/v2020.2.tar.gz b/v2020.2.tar.gz
new file mode 100644
index 0000000..1e73a6a
--- /dev/null
+++ b/v2020.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29f376f6ebc24d3ce39c1aa47101c4b5d256c8247e41068b541dd43bb88d4174
+size 2126892
diff --git a/ver.diff b/ver.diff
index 64d8487..9c85c02 100644
--- a/ver.diff
+++ b/ver.diff
@@ -19,7 +19,7 @@ Index: spirv-tools-2019.5~git157/source/CMakeLists.txt
  spvtools_pch(SPIRV_SOURCES pch_source)
  
  add_library(${SPIRV_TOOLS} ${SPIRV_SOURCES})
-+set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse16)
++set_target_properties(${SPIRV_TOOLS} PROPERTIES SOVERSION suse17)
  spvtools_default_compile_options(${SPIRV_TOOLS})
  target_include_directories(${SPIRV_TOOLS}
    PUBLIC
@@ -27,7 +27,7 @@ Index: spirv-tools-2019.5~git157/source/CMakeLists.txt
  add_dependencies( ${SPIRV_TOOLS} core_tables enum_string_mapping extinst_tables )
  
  add_library(${SPIRV_TOOLS}-shared SHARED ${SPIRV_SOURCES})
-+set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse16)
++set_target_properties(${SPIRV_TOOLS}-shared PROPERTIES SOVERSION suse17)
  spvtools_default_compile_options(${SPIRV_TOOLS}-shared)
  target_include_directories(${SPIRV_TOOLS}-shared
    PUBLIC
@@ -39,7 +39,7 @@ Index: spirv-tools-2019.5~git157/source/fuzz/CMakeLists.txt
    spvtools_pch(SPIRV_TOOLS_FUZZ_SOURCES pch_source_fuzz)
  
    add_library(SPIRV-Tools-fuzz ${SPIRV_TOOLS_FUZZ_SOURCES})
-+  set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse16)
++  set_target_properties(SPIRV-Tools-fuzz PROPERTIES SOVERSION suse17)
  
    spvtools_default_compile_options(SPIRV-Tools-fuzz)
    target_compile_definitions(SPIRV-Tools-fuzz PUBLIC -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_USE_UNALIGNED=0)
@@ -51,7 +51,7 @@ Index: spirv-tools-2019.5~git157/source/link/CMakeLists.txt
  add_library(SPIRV-Tools-link
    linker.cpp
  )
-+set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse16)
++set_target_properties(SPIRV-Tools-link PROPERTIES SOVERSION suse17)
  
  spvtools_default_compile_options(SPIRV-Tools-link)
  target_include_directories(SPIRV-Tools-link
@@ -63,7 +63,7 @@ Index: spirv-tools-2019.5~git157/source/opt/CMakeLists.txt
  
  add_library(SPIRV-Tools-opt ${SPIRV_TOOLS_OPT_SOURCES})
  
-+set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse16)
++set_target_properties(SPIRV-Tools-opt PROPERTIES SOVERSION suse17)
  spvtools_default_compile_options(SPIRV-Tools-opt)
  target_include_directories(SPIRV-Tools-opt
    PUBLIC
@@ -75,7 +75,7 @@ Index: spirv-tools-2019.5~git157/source/reduce/CMakeLists.txt
  	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
    PRIVATE ${spirv-tools_BINARY_DIR}
  )
-+set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse16)
++set_target_properties(SPIRV-Tools-reduce PROPERTIES SOVERSION suse17)
  # The reducer reuses a lot of functionality from the SPIRV-Tools library.
  target_link_libraries(SPIRV-Tools-reduce
    PUBLIC ${SPIRV_TOOLS}