Index: sys/arch/amd64/conf/files.amd64
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/conf/files.amd64,v
retrieving revision 1.107
diff -p -u -u -r1.107 files.amd64
--- sys/arch/amd64/conf/files.amd64	31 Oct 2018 06:26:25 -0000	1.107
+++ sys/arch/amd64/conf/files.amd64	3 Nov 2018 23:21:47 -0000
@@ -28,7 +28,6 @@ defflag opt_spectre.h	SPECTRE_V2_GCC_MIT
 #
 
 defflag			USER_LDT
-defflag			KASLR
 defflag eisa.h EISA
 
 # Start code
Index: sys/arch/i386/conf/files.i386
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/conf/files.i386,v
retrieving revision 1.396
diff -p -u -u -r1.396 files.i386
--- sys/arch/i386/conf/files.i386	25 Aug 2018 07:48:56 -0000	1.396
+++ sys/arch/i386/conf/files.i386	3 Nov 2018 23:21:48 -0000
@@ -18,8 +18,6 @@ defparam		CPURESET_DELAY
 # Obsolete Xbox support
 obsolete defflag	XBOX
 
-defflag			KASLR
-
 # User-settable LDT (used by WINE)
 defflag			USER_LDT
 
Index: sys/arch/xen/conf/files.compat
===================================================================
RCS file: /cvsroot/src/sys/arch/xen/conf/files.compat,v
retrieving revision 1.31
diff -p -u -u -r1.31 files.compat
--- sys/arch/xen/conf/files.compat	13 Jul 2018 09:37:32 -0000	1.31
+++ sys/arch/xen/conf/files.compat	3 Nov 2018 23:21:48 -0000
@@ -25,7 +25,6 @@ defflag	bioscall.h		XXXBIOSCALL
 defflag	opt_pcibios.h		XXXOPT_PCIBIOS
 defflag	opt_pcifixup.h		XXXOPT_PCIFIXUP
 
-defflag opt_kaslr.h		XXXKASLR
 defflag opt_svs.h		XXXSVS
 
 # User-settable LDT (used by WINE)
Index: sys/conf/files
===================================================================
RCS file: /cvsroot/src/sys/conf/files,v
retrieving revision 1.1215
diff -p -u -u -r1.1215 files
--- sys/conf/files	19 Oct 2018 21:09:10 -0000	1.1215
+++ sys/conf/files	3 Nov 2018 23:21:48 -0000
@@ -285,6 +285,11 @@ defflag opt_sysctl.h		SYSCTL_DISALLOW_CR
 				SYSCTL_INCLUDE_DESCR
 
 #
+# Kernel address space layout randomisation.  Requires platform support.
+#
+defflag				KASLR
+
+#
 # Not entirely MI, but present on multiple arch's
 #
 
Index: sys/kern/init_sysctl.c
===================================================================
RCS file: /cvsroot/src/sys/kern/init_sysctl.c,v
retrieving revision 1.218
diff -p -u -u -r1.218 init_sysctl.c
--- sys/kern/init_sysctl.c	5 Oct 2018 22:12:38 -0000	1.218
+++ sys/kern/init_sysctl.c	3 Nov 2018 23:21:49 -0000
@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: init_sysctl.
 #include "opt_compat_netbsd.h"
 #include "opt_modular.h"
 #include "opt_gprof.h"
+#include "opt_kaslr.h"
 #include "pty.h"
 
 #include <sys/types.h>
@@ -85,7 +86,11 @@ int kern_has_sysvmsg = 0;
 int kern_has_sysvshm = 0;
 int kern_has_sysvsem = 0;
 
+#ifdef KASLR
 int kern_expose_address = 0;
+#else
+int kern_expose_address = 1;
+#endif
 
 static const u_int sysctl_lwpprflagmap[] = {
 	LPR_DETACHED, L_DETACHED,