diff --git a/debian/arch/config b/debian/arch/config
index a0392f8d7..208545fdf 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -1177,7 +1177,6 @@ CONFIG_PATA_SIL680=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_VIDEO_TDA9840=m
 CONFIG_PATA_ATIIXP=m
-CONFIG_FORCEDETH_NAPI=y
 CONFIG_GFS2_FS_LOCKING_NOLOCK=m
 CONFIG_SCSI_NETLINK=y
 CONFIG_USB_PHIDGET=m
@@ -1340,3 +1339,4 @@ CONFIG_VIDEO_OV7670=m
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_WAN_ROUTER_DRIVERS=m
+# CONFIG_FORCEDETH_NAPI is not set
diff --git a/debian/changelog b/debian/changelog
index 28f53a143..b92cf8ae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,7 +29,10 @@ linux-2.6 (2.6.20-1~experimental.1) UNRELEASED; urgency=low
   [ Gordon Farquharson ]
   * Disable broken config options on ARM.
 
- -- maximilian attems <maks@sternwelten.at>  Tue, 30 Jan 2007 09:32:00 +0100
+  [ Frederik Schüler ]
+  * Disable NAPI on forcedeth, it is broken.
+
+ -- Frederik Schüler <fs@debian.org>  Fri, 23 Feb 2007 13:43:07 +0100
 
 linux-2.6 (2.6.18.dfsg.1-10) unstable; urgency=low