diff --git a/debian/arch/config b/debian/arch/config
index e4bce0d18..167f9b2c4 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -473,6 +473,10 @@ CONFIG_MTD_BLKDEVS=m
 # CONFIG_MTD_ESB2ROM is not set
 # CONFIG_MTD_CK804XROM is not set
 CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+CONFIG_MTD_UBI_GLUEBI=n
 
 #
 # Parallel IDE protocol modules
diff --git a/debian/changelog b/debian/changelog
index 715af7da0..80973335f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,8 @@ linux-2.6 (2.6.22~rc3-1~experimental.1) UNRELEASED; urgency=low
     MLX4_INFINIBAND, SPI_AT25, MFD_SM501, DVB_USB_M920X, DVB_USB_GL861,
     DVB_USB_AU6610, DVB_USB_OPERA1, SENSORS_AD7418, SENSORS_ADM1029,
     SENSORS_F75375S, SENSORS_CORETEMP, SENSORS_MAX6650, SENSORS_APPLESMC,
-    I2C_SIMTEC, I2C_TINY_USB, DGRS, SC92031, LIBERTAS_USB, RFKILL and disable
-    SCSI_ESP_CORE, SPI_SPIDEV, CRYPT_CRYPTD in topconfig.
+    I2C_SIMTEC, I2C_TINY_USB, DGRS, SC92031, LIBERTAS_USB, RFKILL, MTD_UBI
+    and disable SCSI_ESP_CORE, SPI_SPIDEV, CRYPT_CRYPTD in topconfig.
   * [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi.
     Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM.
     Disable OSS_OBSOLETE.
@@ -31,7 +31,7 @@ linux-2.6 (2.6.22~rc3-1~experimental.1) UNRELEASED; urgency=low
   [ dann frazier ]
   * Add Xen licensing info to the copyright file. (closes: #368912)
 
- -- maximilian attems <maks@debian.org>  Sat, 26 May 2007 22:40:53 +0200
+ -- maximilian attems <maks@debian.org>  Sat, 26 May 2007 22:47:13 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low