diff -rU2 -I[$]OpenBSD ./etc/changelist ../44/etc/changelist
--- ./etc/changelist	Wed Mar 12 12:28:00 2008
+++ ../44/etc/changelist	Tue Aug 12 18:51:04 2008
@@ -26,5 +26,4 @@
 /etc/dhclient.conf
 /etc/dhcpd.conf
-/etc/dhcpd.interfaces
 /etc/disktab
 /etc/distfile
@@ -133,4 +132,5 @@
 /etc/sysctl.conf
 /etc/syslog.conf
+/etc/sysmerge.ignore
 /etc/ttys
 /etc/usermgmt.conf
diff -rU2 -I[$]OpenBSD ./etc/ftpusers ../44/etc/ftpusers
--- ./etc/ftpusers	Wed Mar 12 12:28:00 2008
+++ ../44/etc/ftpusers	Tue Aug 12 18:51:04 2008
@@ -44,2 +44,4 @@
 _ospf6d
 _snmpd
+_rtadvd
+_ypldap
diff -rU2 -I[$]OpenBSD ./etc/hosts.lpd ../44/etc/hosts.lpd
--- ./etc/hosts.lpd	Wed Mar 12 12:28:00 2008
+++ ../44/etc/hosts.lpd	Tue Aug 12 18:51:04 2008
@@ -1,2 +1,3 @@
-#	$OpenBSD: upgrade44.patch,v 1.2 2008/10/29 02:57:28 nick Exp $
-# as described in lpd(8), place one legal access hostname per line
+#	$OpenBSD: upgrade44.patch,v 1.2 2008/10/29 02:57:28 nick Exp $
+# As described in lpd(8), place one legal access hostname per line.
+# See hosts.equiv(5) for syntax and examples.
diff -rU2 -I[$]OpenBSD ./etc/mail/aliases ../44/etc/mail/aliases
--- ./etc/mail/aliases	Wed Mar 12 12:28:25 2008
+++ ../44/etc/mail/aliases	Tue Aug 12 18:51:21 2008
@@ -44,4 +44,5 @@
 _ripd: /dev/null
 _rstatd: /dev/null
+_rtadvd: /dev/null
 _rusersd: /dev/null
 _snmpd: /dev/null
@@ -51,4 +52,5 @@
 _tftpd: /dev/null
 _x11:   /dev/null
+_ypldap: /dev/null
 bin:	/dev/null
 named:	/dev/null
diff -rU2 -I[$]OpenBSD ./etc/man.conf ../44/etc/man.conf
--- ./etc/man.conf	Wed Mar 12 12:28:00 2008
+++ ../44/etc/man.conf	Tue Aug 12 18:51:04 2008
@@ -10,5 +10,5 @@
 
 # Subdirectories for paths ending in '/', IN SEARCH ORDER.
-_subdir		cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat5 man5 cat7 man7 cat4 man4 cat9 man9 cat3p man3p cat3f man3f
+_subdir		cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat5 man5 cat7 man7 cat4 man4 cat9 man9 cat3p man3p cat3f man3f catn mann
 
 # Files typed by suffix and their commands.
@@ -55,2 +55,3 @@
 8		/usr/{share,X11R6,local}/man/{cat,man}8
 9		/usr/share/man/{cat,man}9
+n		/usr/local/man/{cat,man}n
diff -rU2 -I[$]OpenBSD ./etc/ssh/ssh_config ../44/etc/ssh/ssh_config
--- ./etc/ssh/ssh_config	Wed Mar 12 12:28:08 2008
+++ ../44/etc/ssh/ssh_config	Tue Aug 12 18:51:13 2008
@@ -44,2 +44,3 @@
 #   TunnelDevice any:any
 #   PermitLocalCommand no
+#   VisualHostKey no
diff -rU2 -I[$]OpenBSD ./etc/ssh/sshd_config ../44/etc/ssh/sshd_config
--- ./etc/ssh/sshd_config	Wed Mar 12 12:28:08 2008
+++ ../44/etc/ssh/sshd_config	Tue Aug 12 18:51:13 2008
@@ -27,5 +27,5 @@
 # Lifetime and size of ephemeral version 1 server key
 #KeyRegenerationInterval 1h
-#ServerKeyBits 768
+#ServerKeyBits 1024
 
 # Logging
@@ -40,4 +40,5 @@
 #StrictModes yes
 #MaxAuthTries 6
+#MaxSessions 10
 
 #RSAAuthentication yes
@@ -72,4 +73,5 @@
 #GSSAPICleanupCredentials yes
 
+#AllowAgentForwarding yes
 #AllowTcpForwarding yes
 #GatewayPorts no
diff -rU2 -I[$]OpenBSD ./etc/sudoers ../44/etc/sudoers
--- ./etc/sudoers	Wed Mar 12 12:28:26 2008
+++ ../44/etc/sudoers	Tue Aug 12 18:51:22 2008
@@ -20,5 +20,8 @@
 Defaults env_keep +="OKAY_FILES OWNER PKG_DBDIR PKG_DESTDIR PKG_CACHE PKG_PATH"
 Defaults env_keep +="PKG_TMPDIR PORTSDIR RELEASEDIR SUBPACKAGE WRKOBJDIR"
-Defaults env_keep +="SSH_AUTH_SOCK EDITOR VISUAL"
+Defaults env_keep +="SSH_AUTH_SOCK EDITOR VISUAL SHARED_ONLY"
+
+# Uncomment to disable the lecture the first time you run sudo
+#Defaults !lecture
 
 # Uncomment to preserve the environment for users in group wheel