diff -u bcmwl-5.60.48.36+bdcom/debian/dkms.conf.in bcmwl-5.60.48.36+bdcom/debian/dkms.conf.in
--- bcmwl-5.60.48.36+bdcom/debian/dkms.conf.in
+++ bcmwl-5.60.48.36+bdcom/debian/dkms.conf.in
@@ -8,4 +8,5 @@
 PATCH[0]="0001-MODULE_LICENSE.patch"
 PATCH[1]="0002-Makefile.patch"
+PATCH[2]="0003-autoconf.h.patch"
 
 AUTOINSTALL="yes"
diff -u bcmwl-5.60.48.36+bdcom/debian/changelog bcmwl-5.60.48.36+bdcom/debian/changelog
--- bcmwl-5.60.48.36+bdcom/debian/changelog
+++ bcmwl-5.60.48.36+bdcom/debian/changelog
@@ -1,3 +1,12 @@
+bcmwl (5.60.48.36+bdcom-0ubuntu4) maverick; urgency=low
+
+  * debian/patches/0003-autoconf.h.patch:
+    - Do not #include <linux/autoconf.h> in kernels that include it
+      automatically (2.6.15 or higher).  This fixes building on 2.6.33
+      which moved that file to <generated/autoconf.h>.  (LP: #580594)
+
+ -- Anders Kaseorg <andersk@mit.edu>  Fri, 14 May 2010 21:23:45 -0400
+
 bcmwl (5.60.48.36+bdcom-0ubuntu3) lucid; urgency=low
 
   * Fix control file to support -generic-pae kernel install (LP: #567607) 
only in patch2:
unchanged:
--- bcmwl-5.60.48.36+bdcom.orig/debian/patches/0003-autoconf.h.patch
+++ bcmwl-5.60.48.36+bdcom/debian/patches/0003-autoconf.h.patch
@@ -0,0 +1,20 @@
+Description: Do not #include <linux/autoconf.h> on modern kernels.
+ This header is automatically included into every compilation unit by 
+ the kernel build system as of kernel 2.6.15, and its location has moved
+ from <linux/autoconf.h> to <generated/autoconf.h> in kernel 2.6.33.
+Author: Anders Kaseorg <andersk@mit.edu>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/bcmwl/+bug/580594
+Last-Update: 2010-05-14
+
+diff -ur src/src/include/linuxver.h src/src/include/linuxver.h
+--- src/src/include/linuxver.h	2010-02-05 20:59:15.000000000 -0500
++++ src/src/include/linuxver.h	2010-05-14 21:32:12.869043467 -0400
+@@ -19,7 +19,7 @@
+ #include <linux/version.h>
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0))
+ #include <linux/config.h>
+-#else
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 15)
+ #include <linux/autoconf.h>
+ #endif
+ #include <linux/module.h>