diff --git a/srcpkgs/amdvlk/template b/srcpkgs/amdvlk/template
index 1182a174b55..3223f4f0a4b 100644
--- a/srcpkgs/amdvlk/template
+++ b/srcpkgs/amdvlk/template
@@ -1,12 +1,12 @@
 # Template file for 'amdvlk'
 pkgname=amdvlk
-version=2021.Q2.3
+version=2021.Q2.6
 revision=1
-_llpc_commit=f6a6db59d49977cefa79dab3346a1eba2ecfca3c
-_xgl_commit=d81362ec6baf91a98895572d721ce7497efc8eeb
-_pal_commit=de5f376ca30a108f1fc1fd5cdf33fdfe9f9d5dbb
-_llvm_project_commit=95783cc95c317154202ca84d5d91619e0a097c13
-_spvgen_commit=faf9ff1722d3eac902481401252c2529c6988782
+_llpc_commit=1e493d3dced3f4963cc9d2b6b86b1c523c247860
+_xgl_commit=393fca7a5645923a6dbd7f948bded5b14302211b
+_pal_commit=66f4ef75eed4d098f7652739b9f7dd3cd8bda6e6
+_llvm_project_commit=b9916620f254f7cf91e8c1fb86e7869c20d5c1e0
+_spvgen_commit=8ac72283650fbeb3da2ab18c20ad98d45e3d12e1
 _MetroHash_commit=3c566dd9cda44ca7fd97659e0b53ac953f9037d2
 _CWPack_commit=7387247eb9889ddcabbc1053b9c2052e253b088e
 archs="i686* x86_64*"
@@ -32,12 +32,12 @@ distfiles="https://github.com/GPUOpen-Drivers/AMDVLK/archive/v-${version}.tar.gz
  https://github.com/GPUOpen-Drivers/spvgen/archive/${_spvgen_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/MetroHash/archive/${_MetroHash_commit}.tar.gz
  https://github.com/GPUOpen-Drivers/CWPack/archive/${_CWPack_commit}.tar.gz"
-checksum="ec17d7f7c7af5adaa2fee7744321da3665be215105df7c3fc72bfeff2575a509
- c203bb337cd6e9606ee314f9945cbd3705f1c621985cc5b9ae89e8fc5cfba15c
- c3abc3e6936c727f326d53ccd97b030c8dc2d3d052016a55bb68b2f7aeef9a39
- bc14685a6b1abf865f829075d65a107a47a7951ca884f2ef1b219b06736be66e
- a3962ea0a88e762af1156ce268ddb2e981adea8de91b348c3a736ea9975b349e
- f1676d6f3519224f7a67f1271eadceea26718b3aefc6aaa9de087e176ae3975f
+checksum="19ec4ee9c6461e4dabceeee66ca5403663d604887b75da5f32b8031b61821409
+ abe34706de6e8ab4b7cd8538e4ac838e8c95e55dd28dd9aeef55a6c88f0ed8a5
+ 054c38b8c032b7631f685fd31d1e4937027a3ec039a32ee40b80bcbec540990b
+ f278c657508e8d435ceedf2c8b6052543f8d257f4fc89a52db4e8f60267afe21
+ 5472ce7d943fd5846556d7e03e0e2cead768e2e5cc672820bb4fee0b4eecf02f
+ 2bce76c52fe3ded5b8b15da4373585aa1422145a602db7e0f1170d53ed3ee7a6
  cc8ff538fede25fe023984b3fde27f09b000bdc49793534794cd1d2bf881750a
  186060fbcf87165224ba7df0e1858b66ebc42cf190c481aef1df8d89ebab7abd"
 nocross=yes
@@ -69,9 +69,9 @@ pre_configure() {
 
 do_install() {
 	vinstall build/icd/amdvlk${XBPS_TARGET_WORDSIZE}.so 644 usr/lib/
-	vinstall ${wrksrc}/AMDVLK/json/Redhat/amd_icd${XBPS_TARGET_WORDSIZE}.json \
+	vinstall build/icd/amd_icd${XBPS_TARGET_WORDSIZE}.json \
 		644 usr/share/vulkan/icd.d/
-	vsed -i ${DESTDIR}/usr/share/vulkan/icd.d/amd_icd${XBPS_TARGET_WORDSIZE}.json \
-		-e "s#/usr/lib/#/usr/lib${XBPS_TARGET_WORDSIZE}/#g"
+	vinstall build/icd/amd_icd${XBPS_TARGET_WORDSIZE}.json \
+		644 usr/share/vulkan/implicit_layer.d/
 	vlicense ${wrksrc}/AMDVLK/LICENSE.txt
 }