diff --git a/debian/changelog b/debian/changelog
index 790fcc80e..2ca16bb8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ linux-2.6 (2.6.31~rc5-1~experimental.1) UNRELEASED; urgency=low
   * Allow install in chroot without do_initrd check for piuparts.
   * Cleanup Maintainer scripts from ancient pre linux-2.6 assumptions.
   * Disable DEVKMEM.
+  * Disable INPUT_PCSPKR as replaced by snd-pcsp.
 
   [ Ben Hutchings ]
   * mga: remove unnecessary change from firmware-loading patch
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index 7984f1362..af4025e06 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -350,7 +350,6 @@ CONFIG_KEYBOARD_NEWTON=m
 ## file: drivers/input/misc/Kconfig
 ##
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 
 ##
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 13bf6eb41..265057870 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -342,7 +342,6 @@ CONFIG_KEYBOARD_NEWTON=m
 ## file: drivers/input/misc/Kconfig
 ##
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_ATLAS_BTNS=m
 CONFIG_INPUT_UINPUT=m
diff --git a/debian/config/config b/debian/config/config
index c0027fe74..d20cc7ba0 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -563,6 +563,7 @@ CONFIG_KEYBOARD_STOWAWAY=m
 ##
 ## file: drivers/input/misc/Kconfig
 ##
+# CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_ATI_REMOTE=m
 CONFIG_INPUT_ATI_REMOTE2=m
 CONFIG_INPUT_KEYSPAN_REMOTE=m
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 1b96b34db..20c440b75 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -374,7 +374,6 @@ CONFIG_KEYBOARD_NEWTON=m
 ## file: drivers/input/misc/Kconfig
 ##
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_ATLAS_BTNS=m
diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt
index 7d9c50294..6a83d21eb 100644
--- a/debian/config/mipsel/config.r5k-cobalt
+++ b/debian/config/mipsel/config.r5k-cobalt
@@ -232,7 +232,6 @@ CONFIG_KEYBOARD_ATKBD=m
 ## file: drivers/input/misc/Kconfig
 ##
 CONFIG_INPUT_MISC=y
-# CONFIG_INPUT_PCSPKR is not set
 CONFIG_INPUT_COBALT_BTNS=m
 
 ##
diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config
index fe6c5cbef..078eba096 100644
--- a/debian/config/powerpc/config
+++ b/debian/config/powerpc/config
@@ -330,7 +330,6 @@ CONFIG_KEYBOARD_ATKBD=m
 ## file: drivers/input/misc/Kconfig
 ##
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
 
 ##