diff --git a/debian/changelog b/debian/changelog
index 956a2ce0f..d5fbfcafe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -138,6 +138,7 @@ linux (4.0.4-1) UNRELEASED; urgency=medium
   * linux-image: Depend on kmod without an alternative of module-init-tools
   * linux-image: Add versioned Breaks on udev (<< 208-8~) due to #752742 and
     #756312
+  * [i386] pnp: Disable PNPBIOS_PROC_FS
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 18 May 2015 00:00:06 +0100
 
diff --git a/debian/config/kernelarch-x86/config-arch-32 b/debian/config/kernelarch-x86/config-arch-32
index ed48aadf9..65270748e 100644
--- a/debian/config/kernelarch-x86/config-arch-32
+++ b/debian/config/kernelarch-x86/config-arch-32
@@ -356,7 +356,7 @@ CONFIG_ISAPNP=y
 ## file: drivers/pnp/pnpbios/Kconfig
 ##
 CONFIG_PNPBIOS=y
-CONFIG_PNPBIOS_PROC_FS=y
+# CONFIG_PNPBIOS_PROC_FS is not set
 
 ##
 ## file: drivers/scsi/Kconfig