diff --git a/debian/changelog b/debian/changelog
index 60c5cb985..98b7126b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ linux (4.8~rc8-1~exp2) UNRELEASED; urgency=medium
   * [amd64] Enable LEGACY_VSYSCALL_NONE instead of LEGACY_VSYSCALL_EMULATE.
     This breaks (e)glibc 2.13 and earlier, and can be reverted using the kernel
     parameter: vsyscall=emulate
+  * [arm*] Enable STRICT_DEVMEM
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sat, 01 Oct 2016 21:51:33 +0100
 
diff --git a/debian/config/config b/debian/config/config
index 7353c0a3d..dacfea10e 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5788,6 +5788,7 @@ CONFIG_TEST_BPF=m
 CONFIG_TEST_FIRMWARE=m
 # CONFIG_TEST_UDELAY is not set
 CONFIG_TEST_STATIC_KEYS=m
+CONFIG_STRICT_DEVMEM=y
 
 ##
 ## file: lib/fonts/Kconfig
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 54b894b34..d48ac63ec 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -1876,7 +1876,6 @@ CONFIG_MMIOTRACE=y
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 CONFIG_MEMTEST=y
-CONFIG_STRICT_DEVMEM=y
 
 ##
 ## file: lib/xz/Kconfig
diff --git a/debian/config/s390x/config b/debian/config/s390x/config
index b1e5000b3..cff53f997 100644
--- a/debian/config/s390x/config
+++ b/debian/config/s390x/config
@@ -170,11 +170,6 @@ CONFIG_DIAG288_WATCHDOG=m
 ##
 # CONFIG_PCI_QUIRKS is not set
 
-##
-## file: lib/Kconfig.debug
-##
-CONFIG_STRICT_DEVMEM=y
-
 ##
 ## file: mm/Kconfig
 ##