diff --git a/SPIRV-Headers-1.6.g6.tar.xz b/SPIRV-Headers-1.6.g6.tar.xz
deleted file mode 100644
index cd01539..0000000
--- a/SPIRV-Headers-1.6.g6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cdab82b277e132bd7e7f5d3e9236f7cb6ac041383c4a10ccddf1a927527e954a
-size 145876
diff --git a/_service b/_service
deleted file mode 100644
index 7cd1ecb..0000000
--- a/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-<services>
-	<service name="tar_scm" mode="disabled">
- 		<param name="scm">git</param>
-		<param name="url">https://github.com/KhronosGroup/SPIRV-Headers</param>
-		<param name="revision">b42ba6d92faf6b4938e6f22ddd186dbdacc98d78</param>
-		<param name="parent-tag">dcd4752edbc7db6f2ced71b652c45be49fcfa4c5</param>
-		<param name="versionformat">1.6.g@TAG_OFFSET@</param>
-	</service>
-	<service name="recompress" mode="disabled">
-		<param name="file">*.tar</param>
-		<param name="compression">xz</param>
-	</service>
-	<service name="set_version" mode="disabled"/>
-</services>
diff --git a/sdk-1.3.211.0.tar.gz b/sdk-1.3.211.0.tar.gz
new file mode 100644
index 0000000..1847f7b
--- /dev/null
+++ b/sdk-1.3.211.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30a78e61bd812c75e09fdc7a319af206b1044536326bc3e85fea818376a12568
+size 420022
diff --git a/spirv-headers.changes b/spirv-headers.changes
index 9a17fa5..602d29e 100644
--- a/spirv-headers.changes
+++ b/spirv-headers.changes
@@ -1,14 +1,22 @@
+-------------------------------------------------------------------
+Mon Apr 18 23:29:28 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to 1.6.1+sdk211 (4995a2f)
+  * Implement SPV_KHR_uniform_group_instructions extension
+  * Update SPIR-V headers for SPV_INTEL_split_barrier
+  * Implement SPV_INTEL_memory_access_aliasing extension
+
 -------------------------------------------------------------------
 Wed Jan 26 20:47:58 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 
-- Update to snapshot 1.6.g6 (b42ba6d)
+- Update to snapshot 1.6.g6 (b42ba6d / sdk204)
   * Add definitions to implement the SPIR-V 1.6 spec.
   * Add ShaderWriter as SPIR-V generation tool.
 
 -------------------------------------------------------------------
 Thu Nov 11 19:38:18 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
 
-- Update to snapshot 1.5.5.g9 (814e728b)
+- Update to snapshot 1.5.5.g9 (814e728b / sdk198)
   * Add spirv-headers pkgconfig file
   * Implement header definitions for SPV_NV_bindless_texture
   * Add SpecConstantSubgroupMaxSize to the clspv reflection
diff --git a/spirv-headers.spec b/spirv-headers.spec
index 88ac3dd..33e66e6 100644
--- a/spirv-headers.spec
+++ b/spirv-headers.spec
@@ -16,16 +16,22 @@
 #
 
 
+# The git repo is a hodgepodge.
+# Most recent tag is 1.5.4, but that is outdated
+# CMakeLists.txt's project() line contains 1.5.5, but this is outdated too
+# The SPIR-V version is 1.6.1 (include/spirv/unified1/spirv.core.grammar.json)
+# They add "SDK" tags that reflect the Vulkan version (1.3),
+# and the independently increasing toolchain release number (211).
+
 Name:           spirv-headers
-Version:        1.6.g6
+Version:        1.6.1+sdk211
 Release:        0
 Summary:        Machine-readable files from the SPIR-V registry
 License:        MIT
 Group:          Development/Libraries/C and C++
 URL:            https://github.com/KhronosGroup/SPIRV-Headers
 
-#Source:         https://github.com/KhronosGroup/SPIRV-Headers/archive/%%version.tar.gz
-Source:         SPIRV-Headers-%version.tar.xz
+Source:         https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-1.3.211.0.tar.gz
 BuildArch:      noarch
 BuildRequires:  cmake >= 2.8
 BuildRequires:  fdupes
@@ -42,7 +48,7 @@ registry. This includes:
 * The XML registry file.
 
 %prep
-%autosetup -n SPIRV-Headers-%version
+%autosetup -n SPIRV-Headers-sdk-1.3.211.0
 
 %build
 %cmake