diff --git a/debian/changelog b/debian/changelog
index 77a2a81e5..57dff66d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,7 +18,8 @@ linux-2.6 (2.6.30~rc4-1~experimental.1) UNRELEASED; urgency=low
     USB_SERIAL_SYMBOL, ISL29003, SERIAL_MAX3100, VIDEO_HDPVR, VIDEO_CX231XX,
     DRAGONRISE_FF, LEDS_LP5521, LEDS_DAC124S085, LEDS_BD2802,
     UIO_AEC, CRYPTO_ZLIB, REGULATOR_FIXED_VOLTAGE, NOP_USB_XCEIV,
-    POHMELFS, FSCACHE, CACHEFILES, EXOFS, NFS_FSCACHE, AFS_FSCACHE.
+    POHMELFS, FSCACHE, CACHEFILES, EXOFS, NFS_FSCACHE, AFS_FSCACHE,
+    MTD_NAND_NANDSIM.
   * [x86] set new DELL_WMI, EDAC_AMD8131, EDAC_AMD8111.
   * [x86_64] set new CRYPTO_AES_NI_INTEL.
 
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 44a2dd335..9fd6ca6e3 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -659,7 +659,6 @@ CONFIG_MTD_PCI=m
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
-CONFIG_MTD_NAND_NANDSIM=y
 
 ##
 ## file: drivers/net/Kconfig
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 7edac444b..ae118d9c5 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -833,7 +833,6 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
 CONFIG_MTD_NAND_PLATFORM=m
 
 ##
diff --git a/debian/config/arm/config.iop32x b/debian/config/arm/config.iop32x
index 27f2cfce4..bd4ed593f 100644
--- a/debian/config/arm/config.iop32x
+++ b/debian/config/arm/config.iop32x
@@ -481,7 +481,6 @@ CONFIG_MTD_PLATRAM=m
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
 
 ##
 ## file: drivers/mtd/onenand/Kconfig
diff --git a/debian/config/arm/config.ixp4xx b/debian/config/arm/config.ixp4xx
index 68d75f1af..d6df1f127 100644
--- a/debian/config/arm/config.ixp4xx
+++ b/debian/config/arm/config.ixp4xx
@@ -464,7 +464,6 @@ CONFIG_MTD_PLATRAM=m
 CONFIG_MTD_NAND=m
 # CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
 
 ##
 ## file: drivers/mtd/onenand/Kconfig
diff --git a/debian/config/arm/config.orion5x b/debian/config/arm/config.orion5x
index 6ddfe8ddc..a2e64d54a 100644
--- a/debian/config/arm/config.orion5x
+++ b/debian/config/arm/config.orion5x
@@ -298,7 +298,6 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_ALAUDA is not set
 CONFIG_MTD_NAND_ORION=y
diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood
index 5a3d80d99..84ea6afa5 100644
--- a/debian/config/armel/config.kirkwood
+++ b/debian/config/armel/config.kirkwood
@@ -291,7 +291,6 @@ CONFIG_MTD_NAND_VERIFY_WRITE=y
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 # CONFIG_MTD_ALAUDA is not set
 CONFIG_MTD_NAND_ORION=y
diff --git a/debian/config/config b/debian/config/config
index e15b2f40c..6d32a1d1b 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1200,6 +1200,7 @@ CONFIG_MTD_PLATRAM=m
 # CONFIG_MTD_NAND_MUSEUM_IDS is not set
 CONFIG_MTD_NAND_CAFE=m
 CONFIG_MTD_NAND_CS553X=m
+CONFIG_MTD_NAND_NANDSIM=m
 CONFIG_MTD_ALAUDA=m
 
 ##
diff --git a/debian/config/i386/config b/debian/config/i386/config
index ead3c438e..798eb1c13 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -983,7 +983,6 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 # CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
 CONFIG_MTD_NAND_PLATFORM=m
 
 ##
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index da867174d..539891e5b 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -854,7 +854,6 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 CONFIG_MTD_NAND_CAFE=m
-# CONFIG_MTD_NAND_NANDSIM is not set
 
 ##
 ## file: drivers/mtd/onenand/Kconfig
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index 15bc2dbca..16226fd4e 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -1049,7 +1049,6 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 CONFIG_MTD_NAND_CAFE=m
-# CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 
 ##
diff --git a/debian/config/mipsel/config.4kc-malta b/debian/config/mipsel/config.4kc-malta
index 03ea50a7e..9e531e453 100644
--- a/debian/config/mipsel/config.4kc-malta
+++ b/debian/config/mipsel/config.4kc-malta
@@ -853,7 +853,6 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 CONFIG_MTD_NAND_CAFE=m
-# CONFIG_MTD_NAND_NANDSIM is not set
 
 ##
 ## file: drivers/mtd/onenand/Kconfig
diff --git a/debian/config/mipsel/config.5kc-malta b/debian/config/mipsel/config.5kc-malta
index d9a7fe776..a53520af4 100644
--- a/debian/config/mipsel/config.5kc-malta
+++ b/debian/config/mipsel/config.5kc-malta
@@ -1048,7 +1048,6 @@ CONFIG_MTD_NAND_DISKONCHIP=m
 CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 # CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
 CONFIG_MTD_NAND_CAFE=m
-# CONFIG_MTD_NAND_NANDSIM is not set
 # CONFIG_MTD_NAND_PLATFORM is not set
 
 ##