diff --git a/debian/changelog b/debian/changelog
index 5975868ce..60c5cb985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+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
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sat, 01 Oct 2016 21:51:33 +0100
+
 linux (4.8~rc8-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index 8e10c2804..c2f53a35a 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -17,6 +17,11 @@ CONFIG_EFI_MIXED=y
 CONFIG_KEXEC_FILE=y
 CONFIG_KEXEC_VERIFY_SIG=y
 CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
+## choice: vsyscall table for legacy applications
+# CONFIG_LEGACY_VSYSCALL_NATIVE is not set
+# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
+CONFIG_LEGACY_VSYSCALL_NONE=y
+## end choice
 CONFIG_PCI_MMCONFIG=y
 CONFIG_ISA_DMA_API=y
 CONFIG_X86_X32=y