diff --git a/debian/changelog b/debian/changelog
index 94db72a3f..d092c28df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ linux (4.9.6-4) UNRELEASED; urgency=medium
     USB_CONFIGFS_{SERIAL,ACM,OBEX,NCM,ECM,ECM_SUBSET,RNDIS,EEM,PHONET,MASS_STORAGE},
     USB_CONFIGFS_F_{LB_SS,LS,UAC1,UAC2,MIDI,HID,UVC,PRINTER}, USB_ETH_RNDIS,
     USB_FUNCTIONFS_{ETH,RNDIS,GENERIC} (thanks to Riku Voipio)
+  * [ppc64el] Disable IBMEBUS; this bus does not exist on POWER8 systems
 
   [ Roger Shimizu ]
   * [armel] ARM: dts: orion5x-lschl: Fix model name
diff --git a/debian/config/kernelarch-powerpc/config-arch-64 b/debian/config/kernelarch-powerpc/config-arch-64
index 0bd0fa227..ac68835f6 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64
+++ b/debian/config/kernelarch-powerpc/config-arch-64
@@ -102,7 +102,6 @@ CONFIG_MTD_POWERNV_FLASH=m
 ## file: drivers/net/ethernet/ibm/Kconfig
 ##
 CONFIG_IBMVETH=m
-CONFIG_EHEA=m
 
 ##
 ## file: drivers/net/ethernet/ibm/emac/Kconfig
diff --git a/debian/config/kernelarch-powerpc/config-arch-64-be b/debian/config/kernelarch-powerpc/config-arch-64-be
index 71259df00..41663eb8a 100644
--- a/debian/config/kernelarch-powerpc/config-arch-64-be
+++ b/debian/config/kernelarch-powerpc/config-arch-64-be
@@ -42,6 +42,11 @@ CONFIG_PS3_FLASH=m
 CONFIG_PS3_VRAM=m
 CONFIG_PS3_LPM=m
 
+##
+## file: arch/powerpc/platforms/pseries/Kconfig
+##
+CONFIG_IBMEBUS=y
+
 ##
 ## file: drivers/char/hw_random/Kconfig
 ##
@@ -70,6 +75,11 @@ CONFIG_WINDFARM_PM91=m
 CONFIG_WINDFARM_PM112=m
 CONFIG_WINDFARM_PM121=m
 
+##
+## file: drivers/net/ethernet/ibm/Kconfig
+##
+CONFIG_EHEA=m
+
 ##
 ## file: drivers/net/ethernet/pasemi/Kconfig
 ##
diff --git a/debian/installer/ppc64el/modules/ppc64el/nic-modules b/debian/installer/ppc64el/modules/ppc64el/nic-modules
index 8ef5be227..f8c5bb011 100644
--- a/debian/installer/ppc64el/modules/ppc64el/nic-modules
+++ b/debian/installer/ppc64el/modules/ppc64el/nic-modules
@@ -1,5 +1,6 @@
 #include "../../../ppc64/modules/ppc64/nic-modules"
 
 airport -
+ehea -
 ps3_gelic -
 spidernet -