diff --git a/debian/arch/config b/debian/arch/config
index b3bfdd24c..bc0b98c4f 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -268,6 +268,13 @@ CONFIG_SERIAL_8250_BOCA=m
 CONFIG_DVB_PLUTO2=m
 CONFIG_DVB_BCM3510=m
 
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_TINY_USB=m
+
 #
 # Miscellaneous I2C Chip support
 #
@@ -1226,7 +1233,6 @@ CONFIG_SND_MONA=m
 # CONFIG_CIFS_WEAK_PW_HASH is not set
 CONFIG_IPW2200_QOS=y
 CONFIG_RTC_DRV_DS1307=m
-CONFIG_I2C_OCORES=m
 # CONFIG_LCD_CLASS_DEVICE is not set
 # CONFIG_FB_BACKLIGHT is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
diff --git a/debian/changelog b/debian/changelog
index 8a3735b54..012ad7077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,9 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low
     GIGASET_M101, SATA_INIC162X, VIDEO_IVTV, USB_ZR364XX, INFINIBAND_CXGB3,
     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
-    and disable SCSI_ESP_CORE, SPI_SPIDEV in topconfig.
+    SENSORS_F75375S, SENSORS_CORETEMP, SENSORS_MAX6650, SENSORS_APPLESMC,
+    I2C_SIMTEC, I2C_TINY_USB and disable SCSI_ESP_CORE, SPI_SPIDEV 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.
@@ -30,7 +31,7 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low
   [ dann frazier ]
   * Add Xen licensing info to the copyright file. (closes: #368912)
 
- -- maximilian attems <maks@debian.org>  Fri, 25 May 2007 09:44:53 +0200
+ -- maximilian attems <maks@debian.org>  Fri, 25 May 2007 10:34:57 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low