diff --git a/debian/changelog b/debian/changelog
index 3cce528d9..772911aaf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,9 @@ linux (3.11-1~exp1) UNRELEASED; urgency=low
     - [x86] net/ethernet: Disable ATP
   * bluetooth: Disable BT_HCIBTUART; the serial_cs and hci_uart drivers
     should be used instead
+  * PCI: Disable PCIEPORTBUS in configurations for systems without PCI
+    Express: alpha/*, armel/{iop32x,ixp4xx}, hppa/*, mips/!octeon, mipsel/*,
+    sh4/*
 
   [ Bastian Blank ]
   * Symlink doc directory in linux-headers packages.
diff --git a/debian/config/alpha/config b/debian/config/alpha/config
index a747b0816..22e80e496 100644
--- a/debian/config/alpha/config
+++ b/debian/config/alpha/config
@@ -747,6 +747,11 @@ CONFIG_TMD_HERMES=m
 CONFIG_PCI_HERMES=m
 CONFIG_PCMCIA_HERMES=m
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
diff --git a/debian/config/armel/config.iop32x b/debian/config/armel/config.iop32x
index 1663e7fe5..a751abf21 100644
--- a/debian/config/armel/config.iop32x
+++ b/debian/config/armel/config.iop32x
@@ -450,6 +450,11 @@ CONFIG_TMD_HERMES=m
 CONFIG_NORTEL_HERMES=m
 CONFIG_PCI_HERMES=m
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
diff --git a/debian/config/armel/config.ixp4xx b/debian/config/armel/config.ixp4xx
index 5a7ffd351..b47edbc67 100644
--- a/debian/config/armel/config.ixp4xx
+++ b/debian/config/armel/config.ixp4xx
@@ -527,6 +527,11 @@ CONFIG_TMD_HERMES=m
 CONFIG_NORTEL_HERMES=m
 CONFIG_PCI_HERMES=m
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
diff --git a/debian/config/hppa/config b/debian/config/hppa/config
index 6e00d374b..2f211ef1c 100644
--- a/debian/config/hppa/config
+++ b/debian/config/hppa/config
@@ -411,6 +411,11 @@ CONFIG_PDC_STABLE=y
 ##
 # CONFIG_HOTPLUG_PCI is not set
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta
index 90c98646a..62b7b7792 100644
--- a/debian/config/mips/config.4kc-malta
+++ b/debian/config/mips/config.4kc-malta
@@ -770,6 +770,11 @@ CONFIG_ZD1211RW=m
 ##
 # CONFIG_HOTPLUG_PCI is not set
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta
index 9afeba953..34a5120b9 100644
--- a/debian/config/mips/config.5kc-malta
+++ b/debian/config/mips/config.5kc-malta
@@ -774,6 +774,11 @@ CONFIG_ZD1211RW=m
 ##
 # CONFIG_HOTPLUG_PCI is not set
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32
index 774f870a6..9912bcea4 100644
--- a/debian/config/mips/config.r5k-ip32
+++ b/debian/config/mips/config.r5k-ip32
@@ -426,6 +426,11 @@ CONFIG_PARPORT_IP32=m
 ##
 # CONFIG_HOTPLUG_PCI is not set
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a
index bfd4e44b1..675ae5ded 100644
--- a/debian/config/mips/config.sb1-bcm91250a
+++ b/debian/config/mips/config.sb1-bcm91250a
@@ -555,6 +555,11 @@ CONFIG_BROADCOM_PHY=y
 ##
 # CONFIG_HOTPLUG_PCI is not set
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b
index 8ab09e7fb..8bc5ae8b4 100644
--- a/debian/config/mips/config.sb1a-bcm91480b
+++ b/debian/config/mips/config.sb1a-bcm91480b
@@ -561,6 +561,11 @@ CONFIG_BROADCOM_PHY=y
 ##
 # CONFIG_HOTPLUG_PCI is not set
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
diff --git a/debian/config/mipsel/config.loongson-2f b/debian/config/mipsel/config.loongson-2f
index 48d2b5bea..6dd2ae361 100644
--- a/debian/config/mipsel/config.loongson-2f
+++ b/debian/config/mipsel/config.loongson-2f
@@ -60,6 +60,11 @@ CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_8139TOO=m
 CONFIG_8139TOO_TUNE_TWISTER=y
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/scsi/Kconfig
 ##
diff --git a/debian/config/mipsel/config.r5k-cobalt b/debian/config/mipsel/config.r5k-cobalt
index 42a7de30d..1b07e5fbd 100644
--- a/debian/config/mipsel/config.r5k-cobalt
+++ b/debian/config/mipsel/config.r5k-cobalt
@@ -588,6 +588,11 @@ CONFIG_PCI_HERMES=m
 ##
 # CONFIG_HOTPLUG_PCI is not set
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: drivers/pcmcia/Kconfig
 ##
diff --git a/debian/config/sh4/config b/debian/config/sh4/config
index 12a006ab0..b748bae8a 100644
--- a/debian/config/sh4/config
+++ b/debian/config/sh4/config
@@ -34,6 +34,11 @@ CONFIG_CPU_FREQ_STAT_DETAILS=y
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_SH_CPU_FREQ=y
 
+##
+## file: drivers/pci/pcie/Kconfig
+##
+# CONFIG_PCIEPORTBUS is not set
+
 ##
 ## file: kernel/Kconfig.hz
 ##