diff --git a/.gitattributes b/.gitattributes
index cf9c256..9b03811 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,6 +21,3 @@
 *.xz filter=lfs diff=lfs merge=lfs -text
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.zst filter=lfs diff=lfs merge=lfs -text
-## Specific LFS patterns
-iwlwifi-5000-5.ucode filter=lfs diff=lfs merge=lfs -text
-iwlwifi-6000-4.ucode filter=lfs diff=lfs merge=lfs -text
diff --git a/_service b/_service
deleted file mode 100644
index f2eb916..0000000
--- a/_service
+++ /dev/null
@@ -1,13 +0,0 @@
-<services>
-  <service name="tar_scm">
-    <param name="scm">git</param>
-    <param name="url">git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git</param>
-    <param name="version">2.6.38</param>
-    <param name="filename">kernel-firmware</param>
-  </service>
-  <service name="recompress">     
-    <param name="file">*.tar</param>
-    <param name="compression">bz2</param>
-  </service>
-  <service name="set_version"/>
-</services>
diff --git a/firmware.sh b/firmware.sh
index 7d33340..4abc757 100644
--- a/firmware.sh
+++ b/firmware.sh
@@ -24,7 +24,7 @@ get_kernel_dir()
 			head -n1 | cut -d' ' -f 2)
 		if test -n "$pkg"; then
 			kernel=$(rpm -ql "$pkg" | \
-				grep -m1 '^/lib/modules/[2-9][^/]*/kernel$')
+				grep -m1 '^/lib/modules/2\.6\.[^/]*/kernel$')
 		fi
 		if test -d "$kernel"; then
 			return
diff --git a/iwlwifi-5000-5.ucode b/iwlwifi-5000-5.ucode
deleted file mode 100644
index 2de8584..0000000
--- a/iwlwifi-5000-5.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da259ae4b436f4d166aad2139f23694c2737e25288095140a1809d60fe676247
-size 340696
diff --git a/iwlwifi-6000-4.ucode b/iwlwifi-6000-4.ucode
deleted file mode 100644
index 00d127f..0000000
--- a/iwlwifi-6000-4.ucode
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5babe59eda1022a45b2ae0460e13302eff0b3575b776e86fa68e50dfce62f94f
-size 454608
diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index 7214450..caa086a 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -1,23 +1,9 @@
 -------------------------------------------------------------------
-Tue Jul 12 13:32:17 UTC 2011 - mmarek@novell.com
+Thu Jul 14 19:32:48 CEST 2011 - dmueller@suse.de
 
-- Revert the workaround for bnc#673054, the files exist in the
-  tarball now.
-
--------------------------------------------------------------------
-Tue Jul 12 13:16:03 UTC 2011 - mmarek@novell.com
-
-- Fix firmware.sh for 3.0
-
--------------------------------------------------------------------
-Sun Mar 20 20:15:56 CET 2011 - dmueller@suse.de
-
-- update intel 5000 firmware to version matching 2.6.38
-
--------------------------------------------------------------------
-Thu Mar 10 22:21:34 UTC 2011 - gregkh@suse.de
-
-- update intel 6300 firmware to newer version (bnc#653508)
+- update to 20110709: 
+  * provides more stable iwlwifi drivers
+  * remove the need for symlinking bcm43xx-0.fw
 
 -------------------------------------------------------------------
 Thu Feb 24 21:40:58 UTC 2011 - gregkh@suse.de
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index f34f5d0..afb59d5 100644
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@@ -19,16 +19,14 @@
 
 Name:           kernel-firmware
 BuildRequires:  fdupes kernel-default
-Version:        20101214
-Release:        6
+Version:        20110709
+Release:        1
 Summary:        Linux kernel firmware files
 License:        NON-OSI-COMPLIANT(no modification) ; GPLv2 ; GPLv2+ ; MIT License (or similar)
 Group:          System/Kernel
 Url:            ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/
-Source0:        %name-%{version}.tar.bz2
+Source0:        ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/linux-firmware-%{version}.tar.bz2
 Source1:        firmware.sh
-Source2:	iwlwifi-5000-5.ucode
-Source3:	iwlwifi-6000-4.ucode
 %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
@@ -58,7 +56,7 @@ previously included in the kernel. It is shared by all kernels >=
 
 
 %prep
-%setup -q
+%setup -q -n linux-firmware-%version
 
 %build
 # nothing to do
@@ -70,10 +68,6 @@ rm -f %{buildroot}/lib/firmware/WHENCE
 bash %_sourcedir/firmware.sh --kill-duplicates %buildroot/lib/firmware/
 %fdupes %{buildroot}
 
-# fix older version of the iwlwifi firmware (bnc#653508)
-install -m 644 ${RPM_SOURCE_DIR}/iwlwifi-5000-5.ucode %{buildroot}/lib/firmware
-install -m 644 ${RPM_SOURCE_DIR}/iwlwifi-6000-4.ucode %{buildroot}/lib/firmware
-
 %clean
 rm -rf %{buildroot}
 
diff --git a/linux-firmware-20110709.tar.bz2 b/linux-firmware-20110709.tar.bz2
new file mode 100644
index 0000000..d084b8b
--- /dev/null
+++ b/linux-firmware-20110709.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1b61c5ef9b9bd34eff2296dc40a4732939e687ef80f3d0e749f58e4a1990134
+size 15267126