diff --git a/linux-firmware.spec b/linux-firmware.spec
index 57cd16d..492347f 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,5 +1,5 @@
 %global debug_package %{nil}
-%global firmware_release 157
+%global firmware_release 158
 
 %global _firmwarepath	/usr/lib/firmware
 %define _binaries_in_noarch_packages_terminate_build 0
@@ -354,76 +354,78 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %files -n iwl100-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-100-5.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-100-5.ucode*
 
 %files -n iwl105-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-105-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-105-*.ucode*
 
 %files -n iwl135-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-135-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-135-*.ucode*
 
 %files -n iwl1000-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-1000-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-1000-*.ucode*
 
 %files -n iwl2000-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-2000-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-2000-*.ucode*
 
 %files -n iwl2030-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-2030-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-2030-*.ucode*
 
 %files -n iwl3160-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-3160-*.ucode*
 %{_firmwarepath}/iwlwifi-3168-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-3160-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-3168-*.ucode*
 
 %files -n iwl3945-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-3945-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-3945-*.ucode*
 
 %files -n iwl4965-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-4965-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-3945-*.ucode*
 %{_firmwarepath}/intel/iwlwifi/iwlwifi-4965-*.ucode*
 
 %files -n iwl5000-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-5000-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-5000-*.ucode*
 
 %files -n iwl5150-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-5150-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-5150-*.ucode*
 
 %files -n iwl6000-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-6000-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-6000-*.ucode*
 
 %files -n iwl6000g2a-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-6000g2a-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-6000g2a-*.ucode*
 
 %files -n iwl6000g2b-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-6000g2b-*.ucode*
+%{_firmwarepath}/intel/iwlwifi/iwlwifi-6000g2b-*.ucode*
 
 %files -n iwl6050-firmware
 %license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-6050-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-100-5.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-105-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-135-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-1000-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-2000-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-2030-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-5000-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-5150-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-6000-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-6000g2a-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-6000g2b-*.ucode*
 %{_firmwarepath}/intel/iwlwifi/iwlwifi-6050-*.ucode*
 
 %files -n iwl7260-firmware
@@ -435,8 +437,6 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %{_firmwarepath}/iwlwifi-8265-*.ucode*
 %{_firmwarepath}/iwlwifi-9000-*.ucode*
 %{_firmwarepath}/iwlwifi-9260-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-3160-*.ucode*
-%{_firmwarepath}/intel/iwlwifi/iwlwifi-3168-*.ucode*
 %{_firmwarepath}/intel/iwlwifi/iwlwifi-7260-*.ucode*
 %{_firmwarepath}/intel/iwlwifi/iwlwifi-7265-*.ucode*
 %{_firmwarepath}/intel/iwlwifi/iwlwifi-7265D-*.ucode*
@@ -548,11 +548,16 @@ if st and st.type == "directory" then
 end
 
 %changelog
-* Tue Aug 12 2025 Denys Vlasenko <dvlasenk@redhat.com> - 20251111-157
+* Sat Nov 15 2025 Denys Vlasenko <dvlasenk@redhat.com> - 20251111-158
+- Fix placement of several iwlwifi files in iwl*-firmware
+- Correct changelog dates
+Resolves: RHEL-128087
+
+* Fri Nov 14 2025 Denys Vlasenko <dvlasenk@redhat.com> - 20251111-157
 - Fix duplicate iwlwifi files in iwl*-firmware and linux-firmware packages
 Resolves: RHEL-128087
 
-* Tue Aug 12 2025 Denys Vlasenko <dvlasenk@redhat.com> - 20251111-156
+* Tue Nov 11 2025 Denys Vlasenko <dvlasenk@redhat.com> - 20251111-156
 - Update linux-firmware to latest upstream (RHEL-128087)
   Changes since the last update are noted on items below, copied from
   the git changelog of upstream linux-firmware repository.