diff --git a/debian/changelog b/debian/changelog
index bb6d6efed..b4d1f34cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ linux-2.6 (2.6.15+2.6.16-rc3-0experimental.1) UNRELEASED; urgency=low
   * [sparc] Add sys_newfstatat -> sys_fstatat64 fix from git.
   * [arm] Update configs for 2.6.16-rc3.
   * [armeb] Update configs for 2.6.16-rc3.
+  * [arm/armeb] Fix compilation error on NSLU2 due to recent flash
+    changes (Alessandro Zummo).
 
   [ Norbert Tretkowski ]
   * [alpha] Update arch/alpha/config* for 2.6.16-rc3.
diff --git a/debian/patches/arm-nslu2-fix-flash.patch b/debian/patches/arm-nslu2-fix-flash.patch
new file mode 100644
index 000000000..7515c2de0
--- /dev/null
+++ b/debian/patches/arm-nslu2-fix-flash.patch
@@ -0,0 +1,21 @@
+## DP: Fix compilation error due to flash changes
+## DP: Patch author: Alessandro Zummo <a.zummo@towertech.it>
+## DP: Upstream status: submitted
+# Fixes build failure introduced by
+# http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=54e269ead6e672325866037b0617a72edd1396b9
+#
+
+ arch/arm/mach-ixp4xx/nslu2-setup.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- linux-nslu2.orig/arch/arm/mach-ixp4xx/nslu2-setup.c	2006-02-06 21:49:41.000000000 +0100
++++ linux-nslu2/arch/arm/mach-ixp4xx/nslu2-setup.c	2006-02-06 21:59:55.000000000 +0100
+@@ -27,8 +27,6 @@ static struct flash_platform_data nslu2_
+ };
+ 
+ static struct resource nslu2_flash_resource = {
+-	.start			= NSLU2_FLASH_BASE,
+-	.end			= NSLU2_FLASH_BASE + NSLU2_FLASH_SIZE,
+ 	.flags			= IORESOURCE_MEM,
+ };
+ 
diff --git a/debian/patches/series/0experimental.1 b/debian/patches/series/0experimental.1
index cd47198cc..bd61eedbd 100644
--- a/debian/patches/series/0experimental.1
+++ b/debian/patches/series/0experimental.1
@@ -16,3 +16,4 @@
 + sparc64-hme-lockup.patch
 + sparc64-atyfb-xl-gr.patch
 + sparc-sys_fstatat64.patch
++ arm-nslu2-fix-flash.patch