diff --git a/debian/changelog b/debian/changelog
index 206295baf..c2792b906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ linux-2.6 (2.6.36~rc7-1~experimental.1) UNRELEASED; urgency=low
   * qla4xxx: Fix build on some architectures lacking 64-bit I/O
     (Closes: #598503)
   * [x86] Enable modular TM6000, TM6000_ALSA, TM6000_DVB
+  * [x86] Staging: fix Makefile so brcm80211 will actually build
+    (Closes: #599465)
 
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 07 Oct 2010 03:24:21 +0100
 
diff --git a/debian/patches/bugfix/all/staging-fix-Makefile-so-broadcom-driver-will-build.patch b/debian/patches/bugfix/all/staging-fix-Makefile-so-broadcom-driver-will-build.patch
new file mode 100644
index 000000000..6cf885ff1
--- /dev/null
+++ b/debian/patches/bugfix/all/staging-fix-Makefile-so-broadcom-driver-will-build.patch
@@ -0,0 +1,33 @@
+From: Greg Kroah-Hartman <gregkh@suse.de>
+Date: Wed, 8 Sep 2010 23:14:18 -0700
+Subject: [PATCH] Staging: fix Makefile so broadcom driver will actually build.
+
+commit 6b5e0736634d7b3d5f88d801e5a5e456190c42db upstream.
+
+It would be nice if people tested their patches before sending
+them to me...
+
+Cc: Henry Ptasinski <henryp@broadcom.com>
+Cc: Brett Rudley <brudley@broadcom.com>
+Cc: Nohee Ko <noheek@broadcom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/staging/Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
+index 2e82589..88a934e 100644
+--- a/drivers/staging/Makefile
++++ b/drivers/staging/Makefile
+@@ -14,7 +14,7 @@ obj-$(CONFIG_W35UND)		+= winbond/
+ obj-$(CONFIG_PRISM2_USB)	+= wlan-ng/
+ obj-$(CONFIG_ECHO)		+= echo/
+ obj-$(CONFIG_OTUS)		+= otus/
+-obj-$(CONFIG_BRCM80211))	+= brcm80211/
++obj-$(CONFIG_BRCM80211)		+= brcm80211/
+ obj-$(CONFIG_RT2860)		+= rt2860/
+ obj-$(CONFIG_RT2870)		+= rt2870/
+ obj-$(CONFIG_COMEDI)		+= comedi/
+-- 
+1.7.1
+
diff --git a/debian/patches/series/base b/debian/patches/series/base
index 87b074729..88d5616ea 100644
--- a/debian/patches/series/base
+++ b/debian/patches/series/base
@@ -42,6 +42,7 @@
 + features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch
 
 + features/all/staging-Add-initial-release-of-brcm80211.patch
++ bugfix/all/staging-fix-Makefile-so-broadcom-driver-will-build.patch
 + bugfix/all/brcm80211-Fix-some-initialisation-failure-paths.patch
 
 + bugfix/all/vivi-Don-t-depend-on-FONTS.patch