diff --git a/debian/changelog b/debian/changelog
index de52929d2..4023aef35 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -129,6 +129,7 @@ linux (4.2.3-1) UNRELEASED; urgency=medium
   * [mips*/octeon] Enable MMC, MMC_BLOCK, OCTEON_MMC and other drivers as
     modules (Closes: #800594)
   * ath10k: add qca6164 support (Closes: #800703)
+  * [!x86] net: Disable VMXNET3, only useful in VMware x86 virtual machines
 
   [ Salvatore Bonaccorso ]
   * ipc: Initialize msg/shm IPC objects before doing ipc_addid()
diff --git a/debian/config/config b/debian/config/config
index 236785808..059260c80 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -2424,7 +2424,7 @@ CONFIG_VIRTIO_NET=m
 CONFIG_NLMON=m
 CONFIG_XEN_NETDEV_FRONTEND=m
 CONFIG_XEN_NETDEV_BACKEND=m
-CONFIG_VMXNET3=m
+# CONFIG_VMXNET3 is not set
 
 ##
 ## file: drivers/net/appletalk/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 521ebe44e..1acdb90b8 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -960,6 +960,7 @@ CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
 CONFIG_DUMMY=m
 CONFIG_NET_FC=y
 CONFIG_NET_SB1000=m
+CONFIG_VMXNET3=m
 
 ##
 ## file: drivers/net/arcnet/Kconfig