diff --git a/debian/arch/alpha/config b/debian/arch/alpha/config
index bcfc31b86..fef918bae 100644
--- a/debian/arch/alpha/config
+++ b/debian/arch/alpha/config
@@ -1459,7 +1459,6 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m
diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config
index ba5a0cded..5d317125b 100644
--- a/debian/arch/amd64/config
+++ b/debian/arch/amd64/config
@@ -1390,7 +1390,6 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m
diff --git a/debian/arch/arm/config.footbridge b/debian/arch/arm/config.footbridge
index f4cf55bcc..8610e41b6 100644
--- a/debian/arch/arm/config.footbridge
+++ b/debian/arch/arm/config.footbridge
@@ -1133,7 +1133,6 @@ CONFIG_USB_ISP116X_HCD=m
 #
 # USB Device Class drivers
 #
-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=m
diff --git a/debian/arch/config b/debian/arch/config
index 9d4b5ee66..251ebdaf4 100644
--- a/debian/arch/config
+++ b/debian/arch/config
@@ -614,7 +614,6 @@ CONFIG_USB_SISUSBVGA_CON=y
 CONFIG_USB_NET_CDC_SUBSET=m
 CONFIG_USB_NET_NET1080=m
 CONFIG_9P_FS=m
-# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 CONFIG_FUSION_SAS=m
 CONFIG_NETFILTER_NETLINK_QUEUE=m
 CONFIG_INET_DCCP_DIAG=m
@@ -737,3 +736,5 @@ CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_PACKET_MMAP=y
 CONFIG_MKISS=m
+# CONFIG_USB_MIDI is not set
+CONFIG_OBSOLETE_OSS_USB_DRIVER=y
diff --git a/debian/arch/hppa/config b/debian/arch/hppa/config
index 61d6bf7fc..696a68dc5 100644
--- a/debian/arch/hppa/config
+++ b/debian/arch/hppa/config
@@ -814,7 +814,6 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
 # CONFIG_USB_ACM is not set
 # CONFIG_USB_PRINTER is not set
 CONFIG_USB_STORAGE=m
diff --git a/debian/arch/i386/config b/debian/arch/i386/config
index 80d554300..a1c9129a1 100644
--- a/debian/arch/i386/config
+++ b/debian/arch/i386/config
@@ -1644,7 +1644,6 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m
diff --git a/debian/arch/ia64/config b/debian/arch/ia64/config
index 803a8cc14..c518cba72 100644
--- a/debian/arch/ia64/config
+++ b/debian/arch/ia64/config
@@ -1131,7 +1131,6 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m
diff --git a/debian/arch/powerpc/config b/debian/arch/powerpc/config
index 7ee74ff03..f375fec08 100644
--- a/debian/arch/powerpc/config
+++ b/debian/arch/powerpc/config
@@ -1022,7 +1022,6 @@ CONFIG_USB_UHCI_HCD=m
 CONFIG_USB_SL811_HCD=m
 CONFIG_USB_SL811_CS=m
 CONFIG_USB_AUDIO=m
-CONFIG_USB_MIDI=m
 CONFIG_USB_ACM=m
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m
diff --git a/debian/arch/sparc/config.sparc64 b/debian/arch/sparc/config.sparc64
index 8901e8d05..e78c55231 100644
--- a/debian/arch/sparc/config.sparc64
+++ b/debian/arch/sparc/config.sparc64
@@ -330,7 +330,6 @@ CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m
diff --git a/debian/arch/sparc/config.sparc64-smp b/debian/arch/sparc/config.sparc64-smp
index f8d33890c..ec458742c 100644
--- a/debian/arch/sparc/config.sparc64-smp
+++ b/debian/arch/sparc/config.sparc64-smp
@@ -334,7 +334,6 @@ CONFIG_USB_UHCI_HCD=m
 # CONFIG_USB_SL811_HCD is not set
 # CONFIG_USB_AUDIO is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=m
 CONFIG_USB_STORAGE=m
diff --git a/debian/changelog b/debian/changelog
index f17b01ae6..f7a45f9e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,13 @@ linux-2.6 (2.6.14+2.6.15-rc2-0experimental.1) UNRELEASED; urgency=low
   [ Simon Horman ]
   * Add recommends libc6-i686 to 686 and k7 image packages
     (closes: #278729)
+  * Enable OBSOLETE_OSS_USB_DRIVER and USB_AUDIO
+    as alsa snd-usb-audio still isn't quite there.
+    I expect this to be re-disabled at some stage,
+    possibly soon if it proves to be a source of bugs.
+    (closes: #340388)
 
- -- Simon Horman <horms@verge.net.au>  Wed, 30 Nov 2005 16:12:35 +0900
+ -- Simon Horman <horms@verge.net.au>  Wed, 30 Nov 2005 16:42:57 +0900
 
 linux-2.6 (2.6.14-3) unstable; urgency=low