diff --git a/.gitattributes b/.gitattributes
index 9b03811..405dd3a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -21,3 +21,5 @@
 *.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-6000-4.ucode filter=lfs diff=lfs merge=lfs -text
diff --git a/_service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 b/_service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2
index 604d068..b46d78d 100644
--- a/_service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2
+++ b/_service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68a94a9434a853cc3cefac643728f1ce5adfd748df20fa948e84c5c77939917d
-size 27012224
+oid sha256:daa63b7397127c644ed2aa92644f262aa604873fb16b288bac7f829f1c27d5fa
+size 26719539
diff --git a/_service:set_version:kernel-firmware.spec b/_service:set_version:kernel-firmware.spec
index 93cac4c..0ba61b9 100644
--- a/_service:set_version:kernel-firmware.spec
+++ b/_service:set_version:kernel-firmware.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package kernel-firmware (Version git)
+# spec file for package kernel-firmware
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -27,6 +27,7 @@ Group:          System/Kernel
 Url:            ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/
 Source0:        %name-%{version}.tar.bz2
 Source1:        firmware.sh
+Source2:	iwlwifi-6000-4.ucode
 %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
@@ -68,6 +69,9 @@ 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)
+cp ${RPM_SOURCE_DIR}/iwlwifi-6000-4.ucode %{buildroot}/lib/firmware
+
 # create symlinks for Broadcom driver (bnc#673054)
 cd %{buildroot}/lib/firmware/brcm/
 ln -s bcm43xx-0-610-809-0.fw bcm43xx-0.fw
diff --git a/iwlwifi-6000-4.ucode b/iwlwifi-6000-4.ucode
new file mode 100644
index 0000000..00d127f
--- /dev/null
+++ b/iwlwifi-6000-4.ucode
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5babe59eda1022a45b2ae0460e13302eff0b3575b776e86fa68e50dfce62f94f
+size 454608
diff --git a/kernel-firmware.changes b/kernel-firmware.changes
index 5d12ffa..fcfa696 100644
--- a/kernel-firmware.changes
+++ b/kernel-firmware.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 10 22:21:34 UTC 2011 - gregkh@suse.de
+
+- update intel 6300 firmware to newer version (bnc#653508)
+
 -------------------------------------------------------------------
 Thu Feb 24 21:40:58 UTC 2011 - gregkh@suse.de
 
diff --git a/kernel-firmware.spec b/kernel-firmware.spec
index a5fb22a..aa6d0f2 100644
--- a/kernel-firmware.spec
+++ b/kernel-firmware.spec
@@ -27,6 +27,7 @@ Group:          System/Kernel
 Url:            ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/
 Source0:        %name-%{version}.tar.bz2
 Source1:        firmware.sh
+Source2:	iwlwifi-6000-4.ucode
 %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
@@ -68,6 +69,9 @@ 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)
+cp ${RPM_SOURCE_DIR}/iwlwifi-6000-4.ucode %{buildroot}/lib/firmware
+
 # create symlinks for Broadcom driver (bnc#673054)
 cd %{buildroot}/lib/firmware/brcm/
 ln -s bcm43xx-0-610-809-0.fw bcm43xx-0.fw