Index: usr.sbin/ntp/config.h
===================================================================
--- usr.sbin/ntp/config.h
+++ usr.sbin/ntp/config.h
@@ -287,7 +287,7 @@
 #define DEFAULT_HZ 100
 
 /* Default number of megabytes for RLIMIT_MEMLOCK */
-#define DFLT_RLIMIT_MEMLOCK 32
+#define DFLT_RLIMIT_MEMLOCK -1
 
 /* Default number of 4k pages for RLIMIT_STACK */
 #define DFLT_RLIMIT_STACK 50
Index: usr.sbin/ntp/ntpd/ntp.conf
===================================================================
--- usr.sbin/ntp/ntpd/ntp.conf
+++ usr.sbin/ntp/ntpd/ntp.conf
@@ -102,3 +102,10 @@
 # Use either leapfile in /etc/ntp or periodically updated leapfile in /var/db.
 #leapfile "/etc/ntp/leap-seconds"
 leapfile "/var/db/ntpd.leap-seconds.list"
+
+# Specify the number of megabytes of memory that should be allocated and
+# locked. -1 (default) means "do not lock the process into memory".
+# 0 means "lock whatever memory the process wants into memory". Any other
+# number means to lock up to that number of megabytes into memory.
+# 0 will will result in a segfault when ASLR is enabled.
+#rlimit memlock 32