diff --git a/.gitignore b/.gitignore
index 0c7be40..c39e352 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,8 @@
 /sof-bin-72a04d5.tar.gz
 /sof-bin-topology-1.5-dmic-20db-fix.tar.gz
 /sof-bin-e6d11bf.tar.gz
+/sof-bin-47b436a.tar.gz
+/sof-bin-da8cb04.tar.gz
+/sof-bin-faa5bdc.tar.gz
+/sof-bin-b77c851.tar.gz
+/sof-bin-f31c9ce.tar.gz
diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec
index ef94d8b..622cef9 100644
--- a/alsa-sof-firmware.spec
+++ b/alsa-sof-firmware.spec
@@ -4,19 +4,22 @@
 %global _firmwarepath  /usr/lib/firmware
 
 
-%global sof_version 1.5
-%global sof_commit e6d11bf44f0c7ad6032d201e753aa254bb075ee7
+%global sof_version 1.6.1
+%global sof_commit f31c9ce30ac2792ec39e19da489aee7631e00654
 %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7})
 
+%global tplg_version 1.2.4
+
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
 Version:        %{sof_version}
-Release:        2%{?dist}
+Release:        4%{?dist}
 # See later in the spec for a breakdown of licensing
 License:        BSD
 URL:            https://github.com/thesofproject/sof-bin
 Source:         https://github.com/thesofproject/sof-bin/archive/%{sof_commit}/sof-bin-%{sof_shortcommit}.tar.gz
-Source10:       https://www.alsa-project.org/files/pub/misc/sof/sof-bin-topology-1.5-dmic-20db-fix.tar.gz
+BuildRequires:  alsa-topology >= %{tplg_version}
+BuildRequires:  alsa-topology-utils >= %{tplg_version}
 Conflicts:      alsa-firmware <= 1.2.1-6
 
 # noarch, since the package is firmware
@@ -43,13 +46,13 @@ mv intel/sof/v%{sof_version}/* intel/sof
 rmdir intel/sof/v%{sof_version}
 
 # rename intel signed firmware files
-for platform in apl cnl icl; do
+for platform in apl cnl ehl icl tgl tgl-h; do
   mv intel/sof/intel-signed/sof-$platform-v%{sof_version}.ri intel/sof/intel-signed/sof-$platform.ri
   ln -sf intel-signed/sof-$platform.ri intel/sof/sof-$platform.ri
 done
 
 # rename public signed firmware files
-for platform in apl cnl icl; do
+for platform in apl cnl icl jsl tgl tgl-h; do
   mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri
 done
 
@@ -59,11 +62,12 @@ for platform in bdw byt cht; do
 done
 
 # rename debug files
-for platform in apl bdw byt cht cnl icl; do
+for platform in apl bdw byt cht cnl ehl icl tgl tgl-h; do
   mv intel/sof/sof-$platform-v%{sof_version}.ldc intel/sof/sof-$platform.ldc
 done
 
-# add missing symlink
+# add missing symlinks
+ln -s intel-signed/sof-apl.ri intel/sof/sof-glk.ri
 ln -s intel-signed/sof-cnl.ri intel/sof/sof-cml.ri
 ln -s intel-signed/sof-cnl.ri intel/sof/sof-cfl.ri
 
@@ -72,12 +76,14 @@ rm -f intel/sof-tplg
 mv intel/sof-tplg-v%{sof_version} intel/sof-tplg
 
 # remove NXP firmware files
-rm -rf nxp
-
-# patch the topology files (DMIC equalizer fix)
-tar xvzf %{SOURCE10} -C intel/sof-tplg
+rm -rf nxp ../../LICENCE.NXP
+rm -rf intel/sof-tplg/sof-imx8*
 
 %build
+# SST topology files (not SOF related, but it's a Intel hw support
+# and this package seems a good place to distribute them
+alsatplg -c /usr/share/alsa/topology/hda-dsp/skl_hda_dsp_generic-tplg.conf \
+         -o lib/firmware/skl_hda_dsp_generic-tplg.bin
 
 %install
 mkdir -p %{buildroot}%{_firmwarepath}
@@ -101,6 +107,9 @@ cat alsa-sof-firmware.files
 %doc README*
 %dir %{_firmwarepath}
 
+# Licence: 3-clause BSD
+%{_firmwarepath}/*.bin
+
 # Licence: 3-clause BSD
 # .. for files with suffix .tplg
 %{_firmwarepath}/intel/sof-tplg
@@ -118,6 +127,21 @@ if st and st.type == "link" then
 end
 
 %changelog
+* Fri Mar 12 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-4
+- Add SST Skylake HDA topology binary (bug#1933423)
+
+* Fri Mar  5 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-2
+- Add TGL-H firmware files
+
+* Sun Jan  3 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-1
+- Update to v1.6.1
+
+* Thu Dec 10 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-2
+- Update to v1.6 (Dec 9)
+
+* Wed Oct 14 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-1
+- Update to v1.6 (Oct 13)
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 3f4f401..69e33a4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (sof-bin-topology-1.5-dmic-20db-fix.tar.gz) = d933433a1327cc32f2b4c783aee7fca8d5d89f04ebb764b9e6ebb46c84b0035b54083aab50118879da16eedaf8301063be87c680eec09f4b2c4d2915735b7247
-SHA512 (sof-bin-e6d11bf.tar.gz) = 6f5ece43a6f15be4dd38b52bf2d65402a667a8c431688f815e5eabd22ff7efa273052823dba64d68096202e468c7a623bb2338d7cbcbae855cdac78af41824c2
+SHA512 (sof-bin-f31c9ce.tar.gz) = 9eedb85c520c0489e7a2f4c5d09e489d022dd88239e2f18aa792fd538ec11200d750c2501e78868f30d29624ce58522bbd2cc86302dffa9a6cd94f1d640d9840