diff --git a/WHENCE b/WHENCE
index 08b33cca..3e6eb4b6 100644
--- a/WHENCE
+++ b/WHENCE
@@ -4043,15 +4043,35 @@ Licence: Redistributable. See LICENCE.it913x for details
 
 --------------------------------------------------------------------------
 
-Driver: snd_soc_sst_acpi
+Driver: snd_soc_catpt -- Intel AudioDSP driver for HSW/BDW platforms
 
-File: intel/IntcSST2.bin
-Version: 8.4.1.77
+File: intel/catpt/bdw/dsp_basefw.bin
+Version: 44b81c4d5397a63108356f58f036953d9b288c4e
+Link: intel/IntcSST2.bin -> intel/catpt/bdw/dsp_basefw.bin
 
 License: Redistributable. See LICENCE.IntcSST2 for details
 
 --------------------------------------------------------------------------
 
+Driver: snd_soc_avs -- Intel AudioDSP driver for cAVS platforms
+
+File: intel/avs/skl/dsp_basefw.bin
+File: intel/avs/skl/dsp_mod_7CAD0808-AB10-CD23-EF45-12AB34CD56EF.bin
+Version: 9.21.00.4899
+Link: intel/dsp_fw_release.bin -> intel/avs/skl/dsp_basefw.bin
+Link: intel/dsp_fw_kbl.bin -> intel/avs/skl/dsp_basefw.bin
+File: intel/avs/apl/dsp_basefw.bin
+Version: 9.22.01.4908
+Link: intel/dsp_fw_bxtn.bin -> intel/avs/apl/dsp_basefw.bin
+Link: intel/dsp_fw_glk.bin -> intel/avs/apl/dsp_basefw.bin
+File: intel/avs/cnl/dsp_basefw.bin
+Version: 10.23.00.8551
+Link: intel/dsp_fw_cnl.bin -> intel/avs/cnl/dsp_basefw.bin
+
+License: Redistributable. See LICENCE.adsp_sst for details
+
+--------------------------------------------------------------------------
+
 Driver: snd_intel_sst_core
 
 File: intel/fw_sst_0f28.bin
@@ -4076,7 +4096,6 @@ File: intel/dsp_fw_release_v969.bin
 Version: 8.20.00.969
 File: intel/dsp_fw_release_v3402.bin
 Version: 9.21.00.3402_161
-Link: intel/dsp_fw_release.bin -> dsp_fw_release_v3402.bin
 
 License: Redistributable. See LICENCE.adsp_sst for details
 
@@ -4084,7 +4103,6 @@ File: intel/dsp_fw_bxtn_v2219.bin
 Version: 9.22.01.2219_64
 File: intel/dsp_fw_bxtn_v3366.bin
 Version: 9.22.01.3366_157
-Link: intel/dsp_fw_bxtn.bin -> dsp_fw_bxtn_v3366.bin
 
 License: Redistributable. See LICENCE.adsp_sst for details
 
@@ -4102,7 +4120,6 @@ File: intel/dsp_fw_kbl_v3420.bin
 Version: 9.21.00.3420_163
 File: intel/dsp_fw_kbl_v3402.bin
 Version: 9.21.00.3402_161
-Link: intel/dsp_fw_kbl.bin -> dsp_fw_kbl_v3402.bin
 
 License: Redistributable. See LICENCE.adsp_sst for details
 
@@ -4114,13 +4131,11 @@ File: intel/dsp_fw_glk_v2768.bin
 Version: 9.22.01.2768
 File: intel/dsp_fw_glk_v3366.bin
 Version: 9.22.01.3366_157
-Link: intel/dsp_fw_glk.bin -> dsp_fw_glk_v3366.bin
 
 File: intel/dsp_fw_cnl_v1191.bin
 Version: 10.00.00.1191
 File: intel/dsp_fw_cnl_v1858.bin
 Version: 10.23.00.1858
-Link: intel/dsp_fw_cnl.bin -> dsp_fw_cnl_v1858.bin
 
 License: Redistributable. See LICENCE.adsp_sst for details
 
diff --git a/intel/avs/apl/dsp_basefw.bin b/intel/avs/apl/dsp_basefw.bin
new file mode 100644
index 00000000..af3a718a
Binary files /dev/null and b/intel/avs/apl/dsp_basefw.bin differ
diff --git a/intel/avs/cnl/dsp_basefw.bin b/intel/avs/cnl/dsp_basefw.bin
new file mode 100644
index 00000000..340dd86d
Binary files /dev/null and b/intel/avs/cnl/dsp_basefw.bin differ
diff --git a/intel/avs/skl/dsp_basefw.bin b/intel/avs/skl/dsp_basefw.bin
new file mode 100644
index 00000000..f9d54ee0
Binary files /dev/null and b/intel/avs/skl/dsp_basefw.bin differ
diff --git a/intel/avs/skl/dsp_mod_7CAD0808-AB10-CD23-EF45-12AB34CD56EF.bin b/intel/avs/skl/dsp_mod_7CAD0808-AB10-CD23-EF45-12AB34CD56EF.bin
new file mode 100644
index 00000000..5853d75e
Binary files /dev/null and b/intel/avs/skl/dsp_mod_7CAD0808-AB10-CD23-EF45-12AB34CD56EF.bin differ
diff --git a/intel/IntcSST2.bin b/intel/catpt/bdw/dsp_basefw.bin
similarity index 54%
rename from intel/IntcSST2.bin
rename to intel/catpt/bdw/dsp_basefw.bin
index e11cb61f..b3a41eaf 100644
Binary files a/intel/IntcSST2.bin and b/intel/catpt/bdw/dsp_basefw.bin differ