diff --git a/linux-firmware.spec b/linux-firmware.spec
index a22a2aa..49859ca 100644
--- a/linux-firmware.spec
+++ b/linux-firmware.spec
@@ -1,11 +1,11 @@
 %global checkout b584174
-%global iwlwifi_release 24
+%global firmware_release 25
 
 %global _firmwarepath	/usr/lib/firmware
 
 Name:		linux-firmware
 Version:	20130418
-Release:	0.3.git%{checkout}%{?dist}
+Release:	%{firmware_release}.git%{checkout}%{?dist}
 Summary:	Firmware files used by the Linux kernel
 
 Group:		System Environment/Kernel
@@ -29,14 +29,14 @@ Obsoletes:	rt73usb-firmware < 1.8-11
 BuildRequires: git
 
 %description
-Kernel-firmware includes firmware files required for some devices to
+This package includes firmware files required for some devices to
 operate.
 
 %package -n iwl100-firmware
 Summary:	Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	39.31.5.1
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Obsoletes:	iwl100-firmware < iwl100-firmware-39.31.5.1-4
 %description -n iwl100-firmware
 This package contains the firmware required by the iwlagn driver
@@ -48,7 +48,7 @@ LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel(R) Centrino Wireless-N 105 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	18.168.6.1
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 %description -n iwl105-firmware
 This package contains the firmware required by the iwlagn driver
 for Linux to support the iwl105 hardware.  Usage of the firmware
@@ -59,7 +59,7 @@ LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel(R) Centrino Wireless-N 135 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	18.168.6.1
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 %description -n iwl135-firmware
 This package contains the firmware required by the iwlagn driver
 for Linux to support the iwl135 hardware.  Usage of the firmware
@@ -71,7 +71,7 @@ Summary:	Firmware for Intel® PRO/Wireless 1000 B/G/N network adaptors
 License:	Redistributable, no modification permitted
 Version:	39.31.5.1
 Epoch:		1
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Obsoletes:	iwl1000-firmware < 1:39.31.5.1-3
 %description -n iwl1000-firmware
 This package contains the firmware required by the iwlagn driver
@@ -83,7 +83,7 @@ LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel(R) Centrino Wireless-N 2000 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	18.168.6.1
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 %description -n iwl2000-firmware
 This package contains the firmware required by the iwlagn driver
 for Linux to support the iwl2000 hardware.  Usage of the firmware
@@ -94,7 +94,7 @@ LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel(R) Centrino Wireless-N 2030 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	18.168.6.1
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 %description -n iwl2030-firmware
 This package contains the firmware required by the iwlagn driver
 for Linux to support the iwl2030 hardware.  Usage of the firmware
@@ -105,7 +105,7 @@ LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel® PRO/Wireless 3945 A/B/G network adaptors
 License:	Redistributable, no modification permitted
 Version:	15.32.2.9
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Obsoletes:	iwl3945-firmware < 15.32.2.9-7
 %description -n iwl3945-firmware
 This package contains the firmware required by the iwl3945 driver
@@ -116,7 +116,7 @@ contained inside the provided LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel® PRO/Wireless 4965 A/G/N network adaptors
 License:	Redistributable, no modification permitted
 Version:	228.61.2.24
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Obsoletes:	iwl4965-firmware < 228.61.2.24-5
 %description -n iwl4965-firmware
 This package contains the firmware required by the iwl4965 driver
@@ -127,7 +127,7 @@ contained inside the provided LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors
 License:	Redistributable, no modification permitted
 Version:	8.83.5.1_1
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Obsoletes:	iwl5000-firmware < 8.83.5.1_1-3
 %description -n iwl5000-firmware
 This package contains the firmware required by the iwl5000 driver
@@ -138,7 +138,7 @@ contained inside the provided LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel® PRO/Wireless 5150 A/G/N network adaptors
 License:	Redistributable, no modification permitted
 Version:	8.24.2.2
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Obsoletes:	iwl5150-firmware < 8.24.2.2-4
 %description -n iwl5150-firmware
 This package contains the firmware required by the iwl5150 driver
@@ -149,7 +149,7 @@ contained inside the provided LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel(R) Wireless WiFi Link 6000 AGN Adapter
 License:	Redistributable, no modification permitted
 Version:	9.221.4.1
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Obsoletes:	iwl6000-firmware < 9.221.4.1-4
 %description -n iwl6000-firmware
 This package contains the firmware required by the iwlagn driver
@@ -160,7 +160,7 @@ contained inside the provided LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel(R) Wireless WiFi Link 6005 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	17.168.5.3
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Obsoletes:	iwl6000g2a-firmware < 17.168.5.3-3
 %description -n iwl6000g2a-firmware
 This package contains the firmware required by the iwlagn driver
@@ -171,7 +171,7 @@ contained inside the provided LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel(R) Wireless WiFi Link 6030 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	17.168.5.2
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Obsoletes:	iwl6000g2b-firmware < 17.168.5.2-3
 %description -n iwl6000g2b-firmware
 This package contains the firmware required by the iwlagn driver
@@ -182,7 +182,7 @@ contained inside the provided LICENSE file. Please read it carefully.
 Summary:	Firmware for Intel(R) Wireless WiFi Link 6050 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	41.28.5.1
-Release:	%{iwlwifi_release}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Obsoletes:	iwl6050-firmware < 41.28.5.1-5
 %description -n iwl6050-firmware
 This package contains the firmware required by the iwlagn driver
@@ -368,6 +368,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc WHENCE LICENCE.* LICENSE.*
 
 %changelog
+* Mon May 20 2013 Kyle McMartin <kyle@redhat.com> - 20130418-25.gitb584174
+- Use a common version number for both the iwl*-firmware packages and
+  linux-firmware itself.
+- Don't reference old kernel-firmware package in %description
+
 * Mon May 20 2013 Kyle McMartin <kyle@redhat.com> - 20130418-0.3.gitb584174
 - Bump iwl* version numbers as well...