diff --git a/debian/changelog b/debian/changelog
index b757daf55..4b23f3389 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ linux-2.6 (3.1.0~rc5-1~experimental.1) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
   * [ia64] Disable GENERIC_GPIO (fixes FTBFS)
+  * [i386] libertas: prioritize usb8388_olpc.bin firmware on OLPC machines
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 05 Sep 2011 04:18:43 +0100
 
diff --git a/debian/patches/features/x86/libertas-prioritize-usb8388_olpc.bin-firmware-on-OLPC-machines.patch b/debian/patches/features/x86/libertas-prioritize-usb8388_olpc.bin-firmware-on-OLPC-machines.patch
new file mode 100644
index 000000000..26893ca2a
--- /dev/null
+++ b/debian/patches/features/x86/libertas-prioritize-usb8388_olpc.bin-firmware-on-OLPC-machines.patch
@@ -0,0 +1,56 @@
+Subject: [v2] libertas: prioritize usb8388_olpc.bin firmware on OLPC machines
+Date: Thu, 04 Aug 2011 23:06:52 -0000
+From: Andres Salomon <dilinger@queued.net>
+
+Normally, the v9 firmware will be loaded if it's available.  However, on
+OLPC XO-1 machines, the olpc-specific firmware supports extra functionality.
+This makes the libertas driver attempt to load the custom firmware first
+if the machine is an OLPC machine; if that fails (or it's not an OLPC
+machine), fall back to attempting to load the other firmwares.
+
+Signed-off-by: Andres Salomon <dilinger@queued.net>
+Signed-off-by: Dan Williams <dcbw@redhat.com>
+[bwh: Add "libertas/" to path]
+---
+drivers/net/wireless/libertas/if_usb.c |   21 +++++++++++++++++++++
+ 1 files changed, 21 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
+index b5acc39..527cb11 100644
+--- a/drivers/net/wireless/libertas/if_usb.c
++++ b/drivers/net/wireless/libertas/if_usb.c
+@@ -973,6 +973,23 @@ static const struct {
+ 	{ MODEL_8682, "libertas/usb8682.bin" }
+ };
+ 
++#ifdef CONFIG_OLPC
++
++static int try_olpc_fw(struct if_usb_card *cardp)
++{
++	int retval = -ENOENT;
++
++	/* try the OLPC firmware first; fall back to fw_table list */
++	if (machine_is_olpc() && cardp->model == MODEL_8388)
++		retval = request_firmware(&cardp->fw, "libertas/usb8388_olpc.bin",
++				&cardp->udev->dev);
++	return retval;
++}
++
++#else
++static int try_olpc_fw(struct if_usb_card *cardp) { return -ENOENT; }
++#endif /* !CONFIG_OLPC */
++
+ static int get_fw(struct if_usb_card *cardp, const char *fwname)
+ {
+ 	int i;
+@@ -981,6 +998,10 @@ static int get_fw(struct if_usb_card *cardp, const char *fwname)
+ 	if (fwname)
+ 		return request_firmware(&cardp->fw, fwname, &cardp->udev->dev);
+ 
++	/* Handle OLPC firmware */
++	if (try_olpc_fw(cardp) == 0)
++		return 0;
++
+ 	/* Otherwise search for firmware to use */
+ 	for (i = 0; i < ARRAY_SIZE(fw_table); i++) {
+ 		if (fw_table[i].model != cardp->model)
diff --git a/debian/patches/series/base b/debian/patches/series/base
index eca02becb..4cd4ce0b4 100644
--- a/debian/patches/series/base
+++ b/debian/patches/series/base
@@ -42,3 +42,4 @@
 + bugfix/ia64/nouveau-ACPI-support-is-dependent-on-X86.patch
 + bugfix/alpha/alpha-gpio-GENERIC_GPIO-default-must-be-n.patch
 + bugfix/ia64/ia64-gpio-GENERIC_GPIO-default-must-be-n.patch
++ features/x86/libertas-prioritize-usb8388_olpc.bin-firmware-on-OLPC-machines.patch