diff --git a/ldap/templates/login.conf.erb b/ldap/templates/login.conf.erb
index dbc1ab9..61d196e 100644
--- a/ldap/templates/login.conf.erb
+++ b/ldap/templates/login.conf.erb
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf.in,v 1.2 2007/01/09 10:20:12 millert Exp $
+# $OpenBSD: login.conf.in,v 1.6 2012/02/06 21:25:13 sobrado Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -15,11 +15,14 @@
 #		local password)
 # lchpass	Do not login; change user's local password instead
 # radius	Use radius authentication
+# reject	Use rejected authentication
 # skey		Use S/Key authentication
 # activ		ActivCard X9.9 token authentication
 # crypto	CRYPTOCard X9.9 token authentication
 # snk		Digital Pathways SecureNet Key authentication
+# tis		TIS Firewall Toolkit authentication
 # token		Generic X9.9 token authentication
+# yubikey	YubiKey authentication
 #
 
 # Default allowed authentication styles
@@ -38,13 +41,13 @@ auth-ftp-defaults:auth-ftp=passwd:
 # class.
 #
 default:\
-	:path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin:\
+	:path=/usr/bin /bin /usr/sbin /sbin /usr/X11R6/bin /usr/local/bin /usr/local/sbin:\
 	:umask=022:\
 	:datasize-max=512M:\
 	:datasize-cur=512M:\
 	:maxproc-max=256:\
 	:maxproc-cur=128:\
-	:openfiles-cur=128:\
+	:openfiles-cur=512:\
 	:stacksize-cur=4M:\
 	:localcipher=blowfish,6:\
 	:ypcipher=old:\
@@ -60,7 +63,7 @@ daemon:\
 	:ignorenologin:\
 	:datasize=infinity:\
 	:maxproc=infinity:\
-	:openfiles-cur=128:\
+	:openfiles-cur=512:\
 	:stacksize-cur=8M:\
 	:localcipher=blowfish,8:\
 	:tc=default:
@@ -84,6 +87,14 @@ authpf:\
 	:welcome=/etc/motd.authpf:\
 	:shell=/usr/sbin/authpf:\
 	:tc=default:
+
+#
+# Override resource limits for certain daemons started by rc.d(8)
+#
+bgpd:\
+	:openfiles-cur=512:\
+	:tc=daemon:
+
 <%
 require 'uri'
 
@@ -103,7 +114,7 @@ ldap_server.each do |uri|
     end
     n += 1
 end
-%>
+-%>
 ldap:\
 	:auth=-ldap:\
 	<%= servers -%>
diff --git a/ntpd/templates/openntpd.conf.erb b/ntpd/templates/openntpd.conf.erb
index 7d22739..1be9f84 100644
--- a/ntpd/templates/openntpd.conf.erb
+++ b/ntpd/templates/openntpd.conf.erb
@@ -1,3 +1,4 @@
+# $OpenBSD: ntpd.conf,v 1.11 2009/05/18 16:13:48 stevesk Exp $
 # sample ntpd configuration file, see ntpd.conf(5)
 
 # Addresses to listen on (ntpd does not listen by default)
@@ -7,6 +8,7 @@ listen on *
 #server ntp.example.org
 
 # use a random selection of NTP Pool Time Servers
+# see http://support.ntp.org/bin/view/Servers/NTPPoolServers
 <% ntp_server.each do |server| -%>
 servers <%= server %>
 <% end -%>