diff --git a/debian/changelog b/debian/changelog
index 2f33e2a24..4c7ca9ab4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -79,6 +79,8 @@ linux (4.4.1-1~exp1) UNRELEASED; urgency=medium
     disable THERMAL_OF
   * [x86] Enable INTEL_PMC_IPC as module
   * vfs,nvdimm: Really enable FS_DAX
+  * [amd64] mm,nvdimm: Disable ZONE_DMA; enable ZONE_DEVICE, NVDIMM_PFN
+    - This disables drivers for some AC'97 sound cards
 
  -- Ian Campbell <ijc@debian.org>  Sat, 23 Jan 2016 08:23:05 +0000
 
diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64
index ec289050a..18c0a9fc4 100644
--- a/debian/config/kernelarch-x86/config-arch-64
+++ b/debian/config/kernelarch-x86/config-arch-64
@@ -2,6 +2,7 @@
 ## file: arch/x86/Kconfig
 ##
 CONFIG_64BIT=y
+# CONFIG_ZONE_DMA is not set
 CONFIG_SMP=y
 CONFIG_X86_X2APIC=y
 CONFIG_CALGARY_IOMMU=y
@@ -140,6 +141,11 @@ CONFIG_FUJITSU_ES=m
 ##
 # CONFIG_IPW2100 is not set
 
+##
+## file: drivers/nvdimm/Kconfig
+##
+CONFIG_NVDIMM_PFN=y
+
 ##
 ## file: drivers/scsi/Kconfig
 ##
@@ -183,6 +189,7 @@ CONFIG_SPARSEMEM_MANUAL=y
 ## end choice
 CONFIG_SPARSEMEM_VMEMMAP=y
 # CONFIG_MOVABLE_NODE is not set
+CONFIG_ZONE_DEVICE=y
 
 ##
 ## file: security/Kconfig