diff --git a/.alsa-sof-firmware.metadata b/.alsa-sof-firmware.metadata
index fc1e809..d60b80c 100644
--- a/.alsa-sof-firmware.metadata
+++ b/.alsa-sof-firmware.metadata
@@ -1,2 +1,2 @@
-9ae11529f21b8a256fd653512a5a0840b760c380 SOURCES/sof-adl-rt711-l2-rt1316-l01.tplg.gz
-276426a461afd307a523b589931d6a5efec90088 SOURCES/sof-bin-v1.9.3.tar.gz
+2f648e3b14c2c0482b1388d910e69a362bf1c4c0 SOURCES/sof-bin-v2.1.1.tar.gz
+a72be6d3ac7c68fef0aed6d1bb179c8dab81f4f9 SOURCES/sof-tplg-v2.1.1a.tar.gz
diff --git a/.gitignore b/.gitignore
index ba34066..da8fcc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/sof-adl-rt711-l2-rt1316-l01.tplg.gz
-SOURCES/sof-bin-v1.9.3.tar.gz
+SOURCES/sof-bin-v2.1.1.tar.gz
+SOURCES/sof-tplg-v2.1.1a.tar.gz
diff --git a/SPECS/alsa-sof-firmware.spec b/SPECS/alsa-sof-firmware.spec
index 558b3fa..54699b3 100644
--- a/SPECS/alsa-sof-firmware.spec
+++ b/SPECS/alsa-sof-firmware.spec
@@ -3,22 +3,27 @@
 %define _binaries_in_noarch_packages_terminate_build   0
 %global _firmwarepath  /usr/lib/firmware
 
-%global sof_ver 1.9.3
+%global sof_ver 2.1.1
 #global sof_ver_pre rc2
 %global sof_ver_rel %{?sof_ver_pre:.%{sof_ver_pre}}
 %global sof_ver_pkg v%{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}}
 
+%global with_sof_addon 1
+%global sof_ver_addon 2.1.1a
+
 %global tplg_version 1.2.4
 
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
 Version:        %{sof_ver}
-Release:        4%{?sof_ver_rel}%{?dist}
+Release:        1%{?sof_ver_rel}%{?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/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg}.tar.gz
-Source10:       sof-adl-rt711-l2-rt1316-l01.tplg.gz
+%if 0%{?with_sof_addon}
+Source2:        https://github.com/thesofproject/sof-bin/releases/download/v%{sof_ver_addon}/sof-tplg-v%{sof_ver_addon}.tar.gz
+%endif
 BuildRequires:  alsa-topology >= %{tplg_version}
 BuildRequires:  alsa-topology-utils >= %{tplg_version}
 
@@ -47,8 +52,10 @@ mv sof-%{sof_ver_pkg}/* firmware/intel/sof
 # move topology files
 mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg
 
-# addons
-gunzip -c %{SOURCE10} > firmware/intel/sof-tplg/sof-adl-rt711-l2-rt1316-l01.tplg
+%if 0%{?with_sof_addon}
+tar xvzf %{SOURCE2}
+mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg
+%endif
 
 # remove NXP firmware files
 rm LICENCE.NXP
@@ -98,7 +105,10 @@ cat alsa-sof-firmware.files
 %files debug -f alsa-sof-firmware.debug-files
 
 %changelog
-* Wed May 11 2022 Jaroslav Kysela <perex@perex.cz> - 1.9.3-4
+* Mon Jun 20 2022 Jaroslav Kysela <perex@perex.cz> - 2.1.1-1
+- Update to v2.1.1 + v2.1.1a (topology)
+
+* Wed May 11 2022 Jaroslav Kysela <perex@perex.cz> - 1.9.3-3
 - Add sof-adl-rt711-l2-rt1316-l01.tplg topology file
 
 * Thu Dec 16 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.3-1