diff --git a/debian/changelog b/debian/changelog
index 321d4728d..7e817486f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -77,6 +77,7 @@ linux (4.4.1-1~exp1) UNRELEASED; urgency=medium
   * sound/firewire: Enable SND_FIREWIRE_DIGI00X, SND_FIREWIRE_TASCAM as modules
   * [x86] thermal: Enable INTEL_PCH_THERMAL, INTEL_SOC_DTS_THERMAL as modules
   * [x86] Enable INTEL_PMC_IPC as module
+  * vfs,nvdimm: Really enable FS_DAX
 
  -- Ian Campbell <ijc@debian.org>  Sat, 23 Jan 2016 08:23:05 +0000
 
diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 8811ca04f..22392dd58 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -662,6 +662,11 @@ CONFIG_FB=m
 ##
 CONFIG_ORION_WATCHDOG=m
 
+##
+## file: fs/Kconfig
+##
+# CONFIG_FS_DAX is not set
+
 ##
 ## file: init/Kconfig
 ##
diff --git a/debian/config/config b/debian/config/config
index 8e038ebd4..1be27ed0f 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -4940,6 +4940,7 @@ CONFIG_XEN_MCE_LOG=y
 ##
 ## file: fs/Kconfig
 ##
+CONFIG_FS_DAX=y
 CONFIG_FILE_LOCKING=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y