diff --git a/debian/changelog b/debian/changelog
index 7a91b5955..ab158fc1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ linux-2.6 (3.0.0~rc1-1~experimental.2) UNRELEASED; urgency=low
 
   [ Ben Hutchings ]
   * perf: Cancel -Werror compiler option; fixes FTBFS with perl 5.14
+  * qla4xxx: Remove our fix for #598503; it has now been fixed upstream
+    in a different way and the two changes resulted in FTBFS
 
  -- Ben Hutchings <ben@decadent.org.uk>  Wed, 01 Jun 2011 06:41:14 +0100
 
diff --git a/debian/patches/series/1~experimental.2 b/debian/patches/series/1~experimental.2
index 2c3150f7e..7f05685bb 100644
--- a/debian/patches/series/1~experimental.2
+++ b/debian/patches/series/1~experimental.2
@@ -1,2 +1,3 @@
 + bugfix/arm/plat-iop-fixes-fail-to-build-from-source.patch
 + bugfix/mips/mips-i8259-use-struct-syscore_ops-instead-of-sysdevs.patch
+- bugfix/all/qla4xxx-Fix-build-on-some-architectures-lacking-64-bit-I-O.patch
diff --git a/debian/patches/series/base b/debian/patches/series/base
index 2e178ba9b..96cf0ed3f 100644
--- a/debian/patches/series/base
+++ b/debian/patches/series/base
@@ -34,6 +34,7 @@
 + debian/decnet-Disable-auto-loading-as-mitigation-against-lo.patch
 
 + bugfix/mips/mips-ide-flush-dcache.patch
+# Remove this in next upstream version
 + bugfix/all/qla4xxx-Fix-build-on-some-architectures-lacking-64-bit-I-O.patch
 + bugfix/x86/Skip-looking-for-ioapic-overrides-when-ioapics-are-not-present.patch
 + bugfix/all/dm-Deal-with-merge_bvec_fn-in-component-devices-bett.patch