diff --git a/debian/arch/config b/debian/arch/config
index 0afdee4ce..0a11b78e7 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -509,6 +509,21 @@ CONFIG_DM_ZERO=m
 CONFIG_DM_MULTIPATH=m
 CONFIG_DM_DELAY=m
 
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_BERRY_CHARGE=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_PHIDGET=m
+CONFIG_USB_PHIDGETMOTORCONTROL=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+
 CONFIG_VLAN_8021Q=m
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_NETDEVICES=y
@@ -844,7 +859,6 @@ CONFIG_INFINIBAND_ISER=m
 
 CONFIG_USB_XUSBATM=m
 CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_USB_LD=m
 CONFIG_SERIAL_8250_FOURPORT=m
 CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_PCMCIA_IOCTL=y
@@ -1032,7 +1046,6 @@ CONFIG_SND_AD1889=m
 CONFIG_INET_TCP_DIAG=m
 CONFIG_USB_NET_CDCETHER=m
 CONFIG_DAVICOM_PHY=m
-CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_NET_DM9601=m
 CONFIG_USB_NET_NET1080=m
@@ -1230,7 +1243,6 @@ CONFIG_RTC_DRV_RS5C348=m
 CONFIG_RTC_DRV_PCF8583=m
 # CONFIG_TASKSTATS is not set
 CONFIG_RTC_DRV_MAX6902=m
-CONFIG_USB_CYPRESS_CY7C63=m
 CONFIG_TCP_CONG_VENO=m
 CONFIG_NET_DMA=y
 # CONFIG_CIFS_DEBUG2 is not set
@@ -1240,7 +1252,6 @@ CONFIG_W1_CON=y
 CONFIG_INOTIFY_USER=y
 CONFIG_RTC_DRV_V3020=m
 CONFIG_ACPI_DOCK=m
-CONFIG_USB_APPLEDISPLAY=m
 CONFIG_SMSC_PHY=m
 CONFIG_TRACE_IRQFLAGS_SUPPORT=y
 CONFIG_INET_XFRM_MODE_TRANSPORT=m
@@ -1398,7 +1409,6 @@ CONFIG_SATA_VITESSE=m
 CONFIG_SATA_INIC162X=m
 CONFIG_MICROCODE_OLD_INTERFACE=y
 CONFIG_PCNET32_NAPI=y
-CONFIG_USB_FTDI_ELAN=m
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_USB_NET_MCS7830=m
 CONFIG_EXT4DEV_FS=m
@@ -1428,21 +1438,18 @@ CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_BLK_DEV_JMICRON=m
 CONFIG_PATA_RADISYS=m
 # CONFIG_IPC_NS is not set
-CONFIG_USB_ADUTUX=m
 CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_PATA_WINBOND=m
 CONFIG_JBD2=m
 CONFIG_SSFDC=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
 CONFIG_GFS2_FS_LOCKING_NOLOCK=m
-CONFIG_USB_PHIDGET=m
 CONFIG_PATA_EFAR=m
 CONFIG_USB_SERIAL_MOS7840=m
 # CONFIG_CC_STACKPROTECTOR is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_MSI_LAPTOP=m
 CONFIG_SONY_LAPTOP=m
-CONFIG_USB_PHIDGETMOTORCONTROL=m
 CONFIG_GFS2_FS_LOCKING_DLM=m
 CONFIG_FIB_RULES=y
 CONFIG_ZONE_DMA32=y
@@ -1471,8 +1478,6 @@ CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_DVB_TUNER_QT1010=m
 CONFIG_DVB_TUNER_MT2060=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
 CONFIG_USB_MIDI_GADGET=m
 CONFIG_GFS2_FS=m
 # CONFIG_XFRM_SUB_POLICY is not set
diff --git a/debian/changelog b/debian/changelog
index 8ea389ef6..e367319b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,9 +11,9 @@ 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,
-    RFKILL_INPUT, MTD_UBI, SND_USB_CAIAQ and disable SCSI_ESP_CORE, SPI_SPIDEV,
-    CRYPT_CRYPTD in topconfig.
+    I2C_SIMTEC, I2C_TINY_USB, SC92031, LIBERTAS_USB, RFKILL, RFKILL_INPUT,
+    MTD_UBI, SND_USB_CAIAQ, USB_BERRY_CHARGE 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.
@@ -39,7 +39,7 @@ linux-2.6 (2.6.22~rc3-1~experimental.1) UNRELEASED; urgency=low
     on ARM.
   * arm/ixp4xx: Add patch to set NSLU2 timer frequency.
 
- -- maximilian attems <maks@debian.org>  Wed, 30 May 2007 11:10:26 +0200
+ -- maximilian attems <maks@debian.org>  Wed, 30 May 2007 13:59:54 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low