MFH r289384-r293170

Sponsored by:	The FreeBSD Foundation

48 files changed, 1178 insertions, 412 deletions

diff --git a/etc/Makefile b/etc/Makefile
index 81b9a19..5484c11 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -151,6 +151,12 @@ BIN1+= regdomain.xml
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
 MTREE=	BSD.debug.dist BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
+.if ${MK_LIB32} != "no"
+MTREE+=	BSD.lib32.dist
+.endif
+.if ${MK_LIBSOFT} != "no"
+MTREE+=	BSD.libsoft.dist
+.endif
 .if ${MK_TESTS} != "no"
 MTREE+=	BSD.tests.dist
 .endif
@@ -240,6 +246,9 @@ distribution:
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
+.if ${MK_NTP} != "no"
+	${_+_}cd ${.CURDIR}/ntp; ${MAKE} install
+.endif
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
 .if ${MK_PKGBOOTSTRAP} != "no"
 	${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
@@ -331,6 +340,9 @@ MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \
 	-e 's,\(gid=\)[^ ]*$$,\1${_gid},' 
 .else
 MTREE_FILTER= cat
+.if !defined(NO_FSCHG)
+MTREE_FSCHG=	-i
+.endif
 .endif
 
 MTREES=		mtree/BSD.root.dist		/		\
@@ -341,6 +353,14 @@ MTREES=		mtree/BSD.root.dist		/		\
 .if ${MK_GROFF} != "no"
 MTREES+=	mtree/BSD.groff.dist		/usr
 .endif
+.if ${MK_LIB32} != "no"
+MTREES+=	mtree/BSD.lib32.dist		/usr
+MTREES+=	mtree/BSD.lib32.dist		/usr/lib/debug/usr
+.endif
+.if ${MK_LIBSOFT} != "no"
+MTREES+=	mtree/BSD.libsoft.dist		/usr
+MTREES+=	mtree/BSD.libsoft.dist		/usr/lib/debug/usr
+.endif
 .if ${MK_TESTS} != "no"
 MTREES+=	mtree/BSD.tests.dist		${TESTSBASE}
 MTREES+=	mtree/BSD.tests.dist		/usr/lib/debug/${TESTSBASE}
@@ -352,7 +372,19 @@ MTREES+=	mtree/BSD.sendmail.dist		/
 MTREES+=	../${mtree}			/
 .endfor
 
-distrib-dirs: ${MTREES:N/*}
+# Clean up some directories that where mistakenly created as files that
+# should not have been as part of the nvi update in r281994.
+# This should be removed after 11.0-RELEASE.
+DISTRIB_CLEANUP_SHARE_FILES=	${SHAREDIR}/doc/usd/10.exref ${SHAREDIR}/doc/usd/11.edit
+DISTRIB_CLEANUP_SHARE_FILES+=	${SHAREDIR}/doc/usd/12.vi ${SHAREDIR}/doc/usd/13.viref
+distrib-cleanup: .PHONY
+	for file in ${DISTRIB_CLEANUP_SHARE_FILES}; do \
+		if [ -f ${DESTDIR}/$${file} ]; then \
+			rm -f ${DESTDIR}/$${file}; \
+		fi; \
+	done
+
+distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
 	@set ${MTREES}; \
 	while test $$# -ge 2; do \
 		m=${.CURDIR}/$$1; \
@@ -360,10 +392,11 @@ distrib-dirs: ${MTREES:N/*}
 		d=${DESTDIR}$$1; \
 		shift; \
 		test -d $$d || mkdir -p $$d; \
-		${ECHO} ${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} \
-		    -f $$m -p $$d; \
+		${ECHO} ${MTREE_CMD} -deU ${MTREE_FSCHG} \
+		    ${MTREE_FOLLOWS_SYMLINKS} -f $$m -p $$d; \
 		${MTREE_FILTER} $$m | \
-		${MTREE_CMD} -deU ${MTREE_FOLLOWS_SYMLINKS} -p $$d; \
+		${MTREE_CMD} -deU ${MTREE_FSCHG} ${MTREE_FOLLOWS_SYMLINKS} \
+		    -p $$d; \
 	done; true
 .if defined(NO_ROOT)
 	@set ${MTREES}; \
@@ -384,26 +417,26 @@ distrib-dirs: ${MTREES:N/*}
 .endif
 	${INSTALL_SYMLINK} usr/src/sys ${DESTDIR}/sys
 .if ${MK_MAN} != "no"
-	cd ${DESTDIR}/usr/share/man; \
+	cd ${DESTDIR}${SHAREDIR}/man; \
 	for mandir in man*; do \
 		${INSTALL_SYMLINK} ../$$mandir \
-		    ${DESTDIR}/usr/share/man/en.ISO8859-1/; \
+		    ${DESTDIR}${SHAREDIR}/man/en.ISO8859-1/; \
 		${INSTALL_SYMLINK} ../$$mandir \
-		    ${DESTDIR}/usr/share/man/en.UTF-8/; \
+		    ${DESTDIR}${SHAREDIR}/man/en.UTF-8/; \
 	done
 .if ${MK_OPENSSL} != "no"
-	cd ${DESTDIR}/usr/share/openssl/man; \
+	cd ${DESTDIR}${SHAREDIR}/openssl/man; \
 	for mandir in man*; do \
 		${INSTALL_SYMLINK} ../$$mandir \
-		    ${DESTDIR}/usr/share/openssl/man/en.ISO8859-1/; \
+		    ${DESTDIR}${SHAREDIR}/openssl/man/en.ISO8859-1/; \
 	done
 .endif
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/man.alias`; \
 	while [ $$# -gt 0 ] ; do \
-		${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/man/$$1"; \
+		${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/man/$$1"; \
 		if [ "${MK_OPENSSL}" != "no" ]; then \
 			${INSTALL_SYMLINK} "$$2" \
-			    "${DESTDIR}/usr/share/openssl/man/$$1"; \
+			    "${DESTDIR}${SHAREDIR}/openssl/man/$$1"; \
 		fi; \
 		shift; shift; \
 	done
@@ -411,7 +444,7 @@ distrib-dirs: ${MTREES:N/*}
 .if ${MK_NLS} != "no"
 	set - `grep "^[a-zA-Z]" ${.CURDIR}/nls.alias`; \
 	while [ $$# -gt 0 ] ; do \
-		${INSTALL_SYMLINK} "$$2" "${DESTDIR}/usr/share/nls/$$1"; \
+		${INSTALL_SYMLINK} "$$2" "${DESTDIR}${SHAREDIR}/nls/$$1"; \
 		shift; shift; \
 	done
 .endif
@@ -419,8 +452,8 @@ distrib-dirs: ${MTREES:N/*}
 etc-examples:
 	cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
 	    ${BIN1} ${BIN2} nsmb.conf opieaccess \
-	    ${DESTDIR}/usr/share/examples/etc
+	    ${DESTDIR}${SHAREDIR}/examples/etc
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install \
-	    DESTDIR=${DESTDIR}/usr/share/examples
+	    DESTDIR=${DESTDIR}${SHAREDIR}/examples
 
 .include <bsd.prog.mk>
diff --git a/etc/Makefile.depend b/etc/Makefile.depend
new file mode 100644
index 0000000..f80275d
--- /dev/null
+++ b/etc/Makefile.depend
@@ -0,0 +1,11 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index fbc5d0a..e9dac27 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -115,8 +115,8 @@ daily_status_network_enable="YES"			# Check network status
 daily_status_network_usedns="YES"			# DNS lookups are ok
 daily_status_network_netstat_flags="-d"			# netstat(1) flags
 
-# 430.status-rwho
-daily_status_rwho_enable="YES"				# Check system status
+# 430.status-uptime
+daily_status_uptime_enable="YES"			# Check system uptime
 
 # 440.status-mailq
 daily_status_mailq_enable="YES"				# Check mail status
@@ -311,8 +311,8 @@ if [ -z "${source_periodic_confs_defined}" ]; then
 		    "use \$$var instead." >&2
 		case "$value" in
 		[Yy][Ee][Ss])
-			$var=YES
-			$periodvar=daily
+			eval $var=YES
+			eval $periodvar=daily
 			;;
 		*)
 			eval $var=\"$value\"
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index fbe18db..12aaf31 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -84,6 +84,7 @@ geli_autodetach="YES"	# Automatically detach on last close.
 #geli_mirror_home_flags="-k /etc/geli/home.keys"
 
 root_rw_mount="YES"	# Set to NO to inhibit remounting root read-write.
+root_hold_delay="30"	# Time to wait for root mount hold release.
 fsck_y_enable="NO"	# Set to YES to do fsck -y if the initial preen fails.
 fsck_y_flags=""		# Additional flags for fsck -y
 background_fsck="YES"	# Attempt to run fsck in the background where possible.
@@ -325,6 +326,7 @@ nfs_client_enable="NO"		# This host is an NFS client (or NO).
 nfs_access_cache="60"		# Client cache timeout in seconds
 nfs_server_enable="NO"		# This host is an NFS server (or NO).
 nfs_server_flags="-u -t"	# Flags to nfsd (if enabled).
+nfs_server_managegids="NO"	# The NFS server maps gids for AUTH_SYS (or NO).
 mountd_enable="NO"		# Run mountd (or NO).
 mountd_flags="-r"		# Flags to mountd (if NFS server enabled).
 weak_mountd_authentication="NO"	# Allow non-root mount requests to be served.
@@ -437,9 +439,9 @@ ubthidhci_enable="NO"		# Switch an USB BT controller present on
 
 ### Network link/usability verification options
 netwait_enable="NO"		# Enable rc.d/netwait (or NO)
-#netwait_ip=""			# IP addresses to be pinged by netwait.
+#netwait_ip=""			# Wait for ping response from any IP in this list.
 netwait_timeout="60"		# Total number of seconds to perform pings.
-#netwait_if=""			# Interface name to watch link state on.
+#netwait_if=""			# Wait for active link on each intf in this list.
 netwait_if_timeout="30"		# Total number of seconds to monitor link state.
 
 ### Miscellaneous network options: ###
diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 4f1d92f..56f1a5f 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -169,7 +169,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0409";
-	match "product" "(0x00d5|0x00d6|0x00d7|0x8024|0x8025)";
+	match "product" "(0x00d5|0x00d6|0x00d7)";
+	action "kldload -n uipaq";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0409";
+	match "product" "0x0249";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0409";
+	match "product" "(0x8024|0x8025)";
 	action "kldload -n uipaq";
 };
 
@@ -521,6 +537,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x04bb";
+	match "product" "0x093f";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x04bb";
 	match "product" "(0x0944|0x0945|0x0947|0x0948)";
 	action "kldload -n if_run";
 };
@@ -1064,6 +1088,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x057c";
+	match "product" "0x8401";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0584";
 	match "product" "0xb000";
 	action "kldload -n uplcom";
@@ -1089,7 +1121,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0586";
-	match "product" "(0x3416|0x341a|0x341e)";
+	match "product" "0x3416";
+	action "kldload -n if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0586";
+	match "product" "0x3417";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0586";
+	match "product" "(0x341a|0x341e)";
 	action "kldload -n if_run";
 };
 
@@ -1153,7 +1201,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x05ac";
-	match "product" "(0x0230|0x0231|0x0232|0x0236|0x0237|0x0238|0x023f|0x0240|0x0241|0x0242|0x0243|0x0244|0x0245|0x0246|0x0247|0x0249|0x024a|0x024b|0x024c|0x024d|0x024e|0x0252|0x0253|0x0254|0x0259|0x025a|0x025b|0x0262|0x0263|0x0264|0x0290|0x0291|0x0292)";
+	match "product" "(0x0230|0x0231|0x0232|0x0236|0x0237|0x0238|0x023f|0x0240|0x0241|0x0242|0x0243|0x0244|0x0245|0x0246|0x0247|0x0249|0x024a|0x024b|0x024c|0x024d|0x024e|0x0252|0x0253|0x0254|0x0259|0x025a|0x025b|0x0262|0x0263|0x0264|0x0272|0x0273|0x0274|0x0290|0x0291|0x0292)";
 	action "kldload -n wsp";
 };
 
@@ -1721,6 +1769,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07d1";
+	match "product" "0x3a09";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x07d1";
 	match "product" "0x3a0c";
 	action "kldload -n if_uath";
 };
@@ -1729,6 +1785,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07d1";
+	match "product" "0x3a0f";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x07d1";
 	match "product" "(0x3c03|0x3c04|0x3c06|0x3c07)";
 	action "kldload -n if_rum";
 };
@@ -1737,7 +1801,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x07d1";
-	match "product" "(0x3c09|0x3c0a|0x3c0b|0x3c0d|0x3c0e|0x3c0f|0x3c11|0x3c13|0x3c15|0x3c16)";
+	match "product" "(0x3c09|0x3c0a|0x3c0b|0x3c0d|0x3c0e|0x3c0f)";
+	action "kldload -n if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x07d1";
+	match "product" "0x3c10";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x07d1";
+	match "product" "(0x3c11|0x3c13|0x3c15|0x3c16)";
 	action "kldload -n if_run";
 };
 
@@ -1848,6 +1928,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x083a";
+	match "product" "0xf522";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0841";
 	match "product" "0x0001";
 	action "kldload -n urio";
@@ -1921,7 +2009,39 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0846";
-	match "product" "(0x9021|0x9041)";
+	match "product" "(0x9001|0x9010)";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0846";
+	match "product" "0x9012";
+	action "kldload -n if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0846";
+	match "product" "0x9021";
+	action "kldload -n if_urtwn";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0846";
+	match "product" "0x9040";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0846";
+	match "product" "0x9041";
 	action "kldload -n if_urtwn";
 };
 
@@ -2184,6 +2304,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0ace";
+	match "product" "0x1221";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0af0";
 	match "product" "(0x5000|0x6000|0x6050|0x6100|0x6150|0x6200|0x6250|0x6300|0x6350|0x6500|0x6501|0x6600|0x6601|0x6701)";
 	action "kldload -n u3g";
@@ -2545,6 +2673,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
+	match "product" "0x8152";
+	action "kldload -n if_ure";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0bda";
 	match "product" "0x8170";
 	action "kldload -n if_urtwn";
 };
@@ -2793,13 +2929,37 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cde";
-	match "product" "(0x0022|0x0025)";
+	match "product" "0x0022";
 	action "kldload -n if_run";
 };
 
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0x0cde";
+	match "product" "0x0023";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0cde";
+	match "product" "0x0025";
+	action "kldload -n if_run";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0cde";
+	match "product" "0x0026";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0x0cf3";
 	match "product" "(0x0001|0x0003|0x0005)";
 	action "kldload -n if_uath";
@@ -2809,7 +2969,31 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0cf3";
-	match "product" "(0x3002|0x3004|0x311d|0xe004|0xe019)";
+	match "product" "(0x1001|0x1002|0x1010|0x1011)";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0cf3";
+	match "product" "(0x3002|0x3004|0x311d)";
+	action "kldload -n ng_ubt";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0cf3";
+	match "product" "0x9170";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0cf3";
+	match "product" "(0xe004|0xe019)";
 	action "kldload -n ng_ubt";
 };
 
@@ -3529,7 +3713,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
-	match "product" "(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3)";
+	match "product" "(0x6802|0x6803|0x6804|0x6805|0x6808|0x6809|0x6812|0x6813|0x6815|0x6816|0x6820|0x6821|0x6822|0x6832|0x6833|0x6834|0x6835|0x6838|0x6839|0x683a|0x683b|0x683c|0x683d|0x683e|0x6850|0x6851|0x6852|0x6853|0x6855|0x6856|0x6859|0x685a|0x6880|0x6890|0x6891|0x6892|0x6893|0x68a3)";
 	action "kldload -n u3g";
 };
 
@@ -3545,7 +3729,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1199";
-	match "product" "0x68aa";
+	match "product" "(0x68aa|0x68c0|0x9041)";
 	action "kldload -n u3g";
 };
 
@@ -3657,7 +3841,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x12d1";
-	match "product" "(0x1803|0x1c05|0x1c0b)";
+	match "product" "(0x1573|0x1803|0x1c05|0x1c0b)";
 	action "kldload -n u3g";
 };
 
@@ -3849,6 +4033,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1435";
+	match "product" "0x0326";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x1435";
 	match "product" "0x0427";
 	action "kldload -n if_upgt";
 };
@@ -3865,6 +4057,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x1435";
+	match "product" "0x0804";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x1435";
 	match "product" "(0x0826|0x082a)";
 	action "kldload -n if_uath";
 };
@@ -4529,7 +4729,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x19d2";
-	match "product" "(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0117|0x1179|0x1181|0x1420|0x1514|0x1516|0x2000|0x2002|0x2003|0xffdd|0xffde|0xfff1|0xfff5|0xfffe)";
+	match "product" "(0x0001|0x0002|0x0003|0x0004|0x0005|0x0006|0x0007|0x0008|0x0009|0x000a|0x000b|0x000c|0x000d|0x000e|0x000f|0x0010|0x0011|0x0012|0x0013|0x0014|0x0015|0x0016|0x0017|0x0018|0x0019|0x0020|0x0021|0x0022|0x0023|0x0024|0x0025|0x0026|0x0027|0x0028|0x0029|0x0030|0x0031|0x0032|0x0033|0x0037|0x0039|0x0042|0x0043|0x0048|0x0049|0x0051|0x0052|0x0053|0x0054|0x0055|0x0057|0x0058|0x0059|0x0060|0x0061|0x0062|0x0063|0x0064|0x0066|0x0069|0x0070|0x0073|0x0076|0x0078|0x0082|0x0086|0x0103|0x0117|0x1179|0x1181|0x1420|0x1514|0x1516|0x2000|0x2002|0x2003|0xffdd|0xffde|0xfff1|0xfff5|0xfffe)";
 	action "kldload -n u3g";
 };
 
@@ -4841,6 +5041,14 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2019";
+	match "product" "0x5304";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x2019";
 	match "product" "0xab01";
 	action "kldload -n if_rum";
 };
@@ -5312,6 +5520,14 @@ nomatch 32 {
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
+	match "vendor" "0xcace";
+	match "product" "0x0300";
+	action "kldload -n if_otus";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
 	match "vendor" "0xdaae";
 	match "product" "0xead6";
 	action "kldload -n uslcom";
@@ -5585,5 +5801,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2688 USB entries processed
+# 2719 USB entries processed
 
diff --git a/etc/etc.amd64/ttys b/etc/etc.amd64/ttys
index 8268df3..15eb30d 100644
--- a/etc/etc.amd64/ttys
+++ b/etc/etc.amd64/ttys
@@ -42,8 +42,8 @@ ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 ttyu0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
-ttyu1	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure
+ttyu1	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu2	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu3	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
 # Dumb console
 dcons	"/usr/libexec/getty std.9600"	vt100	off secure
diff --git a/etc/etc.i386/ttys b/etc/etc.i386/ttys
index 8268df3..15eb30d 100644
--- a/etc/etc.i386/ttys
+++ b/etc/etc.i386/ttys
@@ -42,8 +42,8 @@ ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 ttyu0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
-ttyu1	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure
+ttyu1	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu2	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu3	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
 # Dumb console
 dcons	"/usr/libexec/getty std.9600"	vt100	off secure
diff --git a/etc/etc.mips/ttys b/etc/etc.mips/ttys
index a07cbc2..21bb932 100644
--- a/etc/etc.mips/ttys
+++ b/etc/etc.mips/ttys
@@ -30,7 +30,7 @@
 console	none				unknown	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0	"/usr/libexec/getty 3wire"	vt100	on  secure
-ttyu1	"/usr/libexec/getty std.115200"	dialup	off secure
-ttyu2	"/usr/libexec/getty std.115200"	dialup	off secure
-ttyu3	"/usr/libexec/getty std.115200"	dialup	off secure
+ttyu0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu1	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu2	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu3	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
diff --git a/etc/etc.pc98/ttys b/etc/etc.pc98/ttys
index ad20aca..d75cf05 100644
--- a/etc/etc.pc98/ttys
+++ b/etc/etc.pc98/ttys
@@ -41,9 +41,9 @@ ttyv7	"/usr/libexec/getty Pc"		cons25w	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyu1	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure
+ttyu0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu1	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu2	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu3	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
 # Dumb console
 dcons	"/usr/libexec/getty std.9600"	vt100	off secure
diff --git a/etc/etc.powerpc/ttys b/etc/etc.powerpc/ttys
index 793a155..606e963 100644
--- a/etc/etc.powerpc/ttys
+++ b/etc/etc.powerpc/ttys
@@ -41,9 +41,9 @@ ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 #ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyu0	"/usr/libexec/getty 3wire"	vt100	on  secure
-ttyu1	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyu2	"/usr/libexec/getty std.9600"	dialup	off secure
-ttyu3	"/usr/libexec/getty std.9600"	dialup	off secure
+ttyu0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu1	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu2	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu3	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
 # Dumb console
 dcons	"/usr/libexec/getty std.9600"	vt100	off secure
diff --git a/etc/etc.riscv/ttys b/etc/etc.riscv/ttys
new file mode 100644
index 0000000..ede1d79
--- /dev/null
+++ b/etc/etc.riscv/ttys
@@ -0,0 +1,51 @@
+#
+# $FreeBSD$
+#	@(#)ttys	5.1 (Berkeley) 4/17/89
+#
+# This file specifies various information about terminals on the system.
+# It is used by several different programs.  Common entries for the
+# various columns include:
+#
+# name  The name of the terminal device.
+#
+# getty The program to start running on the terminal.  Typically a
+#       getty program, as the name implies.  Other common entries
+#       include none, when no getty is needed, and xdm, to start the
+#       X Window System.
+#
+# type The initial terminal type for this port.  For hardwired
+#      terminal lines, this will contain the type of terminal used.
+#      For virtual consoles, the correct type is typically xterm.
+#      Other common values include dialup for incoming modem ports, and
+#      unknown when the terminal type cannot be predetermined.
+#
+# status Must be on or off.  If on, init will run the getty program on
+#        the specified port.  If the word "secure" appears, this tty
+#        allows root login.
+#
+# name	getty				type	status		comments
+#
+# If console is marked "insecure", then init will ask for the root password
+# when going to single-user mode.
+console	none				unknown	off secure
+#
+ttyv0	"/usr/libexec/getty Pc"		xterm	onifconsole  secure
+# Virtual terminals
+ttyv1	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	off  secure
+#ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
+# Serial terminals
+# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
+ttyu0	"/usr/libexec/getty 3wire"	vt100	onifconsole  secure
+ttyu1	"/usr/libexec/getty 3wire"	vt100	onifconsole  secure
+ttyu2	"/usr/libexec/getty 3wire"	vt100	onifconsole  secure
+ttyu3	"/usr/libexec/getty 3wire"	vt100	onifconsole  secure
+# Dumb console
+dcons	"/usr/libexec/getty std.9600"	vt100	off secure
+# RISC-V HTIF console
+rcons	"/usr/libexec/getty std.9600"	vt100	onifconsole  secure
diff --git a/etc/etc.sparc64/ttys b/etc/etc.sparc64/ttys
index c3fa95f..afca321 100644
--- a/etc/etc.sparc64/ttys
+++ b/etc/etc.sparc64/ttys
@@ -46,9 +46,9 @@ ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.
 # uart(4)
-ttyu0	"/usr/libexec/getty 3wire"	vt100	on  secure
-ttyu1	"/usr/libexec/getty 3wire"	vt100	on  secure
-ttyu2	"/usr/libexec/getty 3wire"	vt100	on  secure
-ttyu3	"/usr/libexec/getty std.9600"	vt100	off secure
+ttyu0	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu1	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu2	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
+ttyu3	"/usr/libexec/getty 3wire"	vt100	onifconsole secure
 # Dumb console
 dcons	"/usr/libexec/getty std.9600"	vt100	off secure
diff --git a/etc/login.conf b/etc/login.conf
index ae6b8a0..2cc6730 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -26,7 +26,7 @@ default:\
 	:passwd_format=sha512:\
 	:copyright=/etc/COPYRIGHT:\
 	:welcome=/etc/motd:\
-	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K,LC_COLLATE=C:\
+	:setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
 	:path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
 	:nologin=/var/run/nologin:\
 	:cputime=unlimited:\
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index 8df0a72..4a499ea 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -27,7 +27,7 @@
             ..
             lib
                 clang
-                    3.7.0
+                    3.7.1
                         lib
                             freebsd
                             ..
@@ -41,12 +41,6 @@
                 private
                 ..
             ..
-            lib32
-                i18n
-                ..
-                private
-                ..
-            ..
             libexec
                 bsdinstall
                 ..
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 48ec8b4..bb0b26d 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -241,6 +241,8 @@
     ..
     krb5
     ..
+    lib80211
+    ..
     libmilter
     ..
     libxo
diff --git a/etc/mtree/BSD.lib32.dist b/etc/mtree/BSD.lib32.dist
new file mode 100644
index 0000000..a82368f
--- /dev/null
+++ b/etc/mtree/BSD.lib32.dist
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    lib32
+        dtrace
+        ..
+        i18n
+        ..
+    ..
+..
diff --git a/etc/mtree/BSD.libsoft.dist b/etc/mtree/BSD.libsoft.dist
new file mode 100644
index 0000000..69026a7
--- /dev/null
+++ b/etc/mtree/BSD.libsoft.dist
@@ -0,0 +1,14 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    libsoft
+        dtrace
+        ..
+        i18n
+        ..
+    ..
+..
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 9e3d08c..ad76402 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -12,6 +12,8 @@
         ..
         date
         ..
+        dd
+        ..
         expr
         ..
         ls
@@ -269,10 +271,16 @@
                     ..
                 ..
             ..
+            nss
+            ..
             regex
                 data
                 ..
             ..
+            resolv
+            ..
+            rpc
+            ..
             ssp
             ..
             stdio
@@ -360,6 +368,8 @@
         ..
     ..
     sys
+        acl
+        ..
         aio
         ..
         fifo
@@ -367,11 +377,21 @@
         file
         ..
         kern
+            acct
+            ..
             execve
             ..
+            pipe
+            ..
         ..
         kqueue
         ..
+        mac
+            bsdextended
+            ..
+            portacl
+            ..
+        ..
         mqueue
         ..
         netinet
@@ -410,6 +430,8 @@
             unlink
             ..
         ..
+        posixshm
+        ..
         vfs
         ..
         vm
@@ -546,6 +568,8 @@
         ..
         lastcomm
         ..
+        limits
+        ..
         m4
         ..
         mkimg
@@ -590,6 +614,8 @@
         ..
         fstyp
         ..
+        makefs
+        ..
         newsyslog
         ..
         nmtree
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index f786438..1a5835b 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -19,8 +19,10 @@
         aout
         ..
         clang
-            3.7.0
+            3.7.1
                 include
+                    sanitizer
+                    ..
                 ..
                 lib
                     freebsd
@@ -43,12 +45,6 @@
             ..
         ..
     ..
-    lib32
-        dtrace
-        ..
-        i18n
-        ..
-    ..
     libdata
         gcc
         ..
@@ -190,12 +186,6 @@
             atm
             ..
             legal
-                intel_ipw
-                ..
-                intel_iwi
-                ..
-                intel_wpi
-                ..
             ..
             llvm
                 clang
@@ -298,6 +288,14 @@
                 ..
                 07.mail
                 ..
+                10.exref
+                ..
+                11.edit
+                ..
+                12.vi
+                ..
+                13.viref
+                ..
                 18.msdiffs
                 ..
                 19.memacros
@@ -517,14 +515,24 @@
             ..
         ..
         locale
-            UTF-8
-            ..
             af_ZA.ISO8859-1
             ..
             af_ZA.ISO8859-15
             ..
             af_ZA.UTF-8
             ..
+            ar_AE.UTF-8
+            ..
+            ar_EG.UTF-8
+            ..
+            ar_JO.UTF-8
+            ..
+            ar_MA.UTF-8
+            ..
+            ar_QA.UTF-8
+            ..
+            ar_SA.UTF-8
+            ..
             am_ET.UTF-8
             ..
             be_BY.CP1131
@@ -543,24 +551,24 @@
             ..
             ca_AD.ISO8859-15
             ..
-            ca_AD.UTF-8
-            ..
             ca_ES.ISO8859-1
             ..
             ca_ES.ISO8859-15
             ..
-            ca_ES.UTF-8
-            ..
             ca_FR.ISO8859-1
             ..
             ca_FR.ISO8859-15
             ..
-            ca_FR.UTF-8
-            ..
             ca_IT.ISO8859-1
             ..
             ca_IT.ISO8859-15
             ..
+            ca_AD.UTF-8
+            ..
+            ca_ES.UTF-8
+            ..
+            ca_FR.UTF-8
+            ..
             ca_IT.UTF-8
             ..
             cs_CZ.ISO8859-2
@@ -619,6 +627,14 @@
             ..
             en_GB.UTF-8
             ..
+            en_HK.ISO8859-1
+            ..
+            en_HK.UTF-8
+            ..
+            en_IE.ISO8859-1
+            ..
+            en_IE.ISO8859-15
+            ..
             en_IE.UTF-8
             ..
             en_NZ.ISO8859-1
@@ -629,6 +645,12 @@
             ..
             en_NZ.UTF-8
             ..
+            en_PH.UTF-8
+            ..
+            en_SG.ISO8859-1
+            ..
+            en_SG.UTF-8
+            ..
             en_US.ISO8859-1
             ..
             en_US.ISO8859-15
@@ -637,12 +659,32 @@
             ..
             en_US.UTF-8
             ..
+            en_ZA.ISO8859-1
+            ..
+            en_ZA.ISO8859-15
+            ..
+            en_ZA.US-ASCII
+            ..
+            en_ZA.UTF-8
+            ..
+            es_AR.ISO8859-1
+            ..
+            es_AR.UTF-8
+            ..
+            es_CR.UTF-8
+            ..
             es_ES.ISO8859-1
             ..
             es_ES.ISO8859-15
             ..
             es_ES.UTF-8
             ..
+            es_MX.ISO8859-1
+            ..
+            es_MX.UTF-8
+            ..
+            et_EE.ISO8859-1
+            ..
             et_EE.ISO8859-15
             ..
             et_EE.UTF-8
@@ -687,6 +729,8 @@
             ..
             hi_IN.ISCII-DEV
             ..
+            hi_IN.UTF-8
+            ..
             hr_HR.ISO8859-2
             ..
             hr_HR.UTF-8
@@ -725,39 +769,21 @@
             ..
             kk_Cyrl_KZ.UTF-8
             ..
-            kk_KZ.PT154
-            ..
-            kk_KZ.UTF-8
-            ..
             ko_KR.CP949
             ..
             ko_KR.UTF-8
             ..
             ko_KR.eucKR
             ..
-            la_LN.ISO8859-1
-            ..
-            la_LN.ISO8859-13
-            ..
-            la_LN.ISO8859-15
-            ..
-            la_LN.ISO8859-2
-            ..
-            la_LN.ISO8859-4
-            ..
-            la_LN.US-ASCII
-            ..
             lt_LT.ISO8859-13
             ..
-            lt_LT.ISO8859-4
-            ..
             lt_LT.UTF-8
             ..
             lv_LV.ISO8859-13
             ..
             lv_LV.UTF-8
             ..
-            mn_MN.UTF-8
+            mn_Cyrl_MN.UTF-8
             ..
             nb_NO.ISO8859-1
             ..
@@ -783,12 +809,6 @@
             ..
             nn_NO.UTF-8
             ..
-            no_NO.ISO8859-1
-            ..
-            no_NO.ISO8859-15
-            ..
-            no_NO.UTF-8
-            ..
             pl_PL.ISO8859-2
             ..
             pl_PL.UTF-8
@@ -817,6 +837,10 @@
             ..
             ru_RU.UTF-8
             ..
+            se_FI.UTF-8
+            ..
+            se_NO.UTF-8
+            ..
             sk_SK.ISO8859-2
             ..
             sk_SK.UTF-8
@@ -825,11 +849,19 @@
             ..
             sl_SI.UTF-8
             ..
-            sr_YU.ISO8859-2
+            sr_Cyrl_RS.ISO8859-5
             ..
-            sr_YU.ISO8859-5
+            sr_Cyrl_RS.UTF-8
             ..
-            sr_YU.UTF-8
+            sr_Latn_RS.ISO8859-2
+            ..
+            sr_Latn_RS.UTF-8
+            ..
+            sv_FI.ISO8859-1
+            ..
+            sv_FI.ISO8859-15
+            ..
+            sv_FI.UTF-8
             ..
             sv_SE.ISO8859-1
             ..
@@ -855,9 +887,27 @@
             ..
             zh_CN.GBK
             ..
+            zh_CN.eucCN
+            ..
             zh_CN.UTF-8
             ..
-            zh_CN.eucCN
+            zh_Hans_CN.GB18030
+            ..
+            zh_Hans_CN.GB2312
+            ..
+            zh_Hans_CN.GBK
+            ..
+            zh_Hans_CN.UTF-8
+            ..
+            zh_Hans_CN.eucCN
+            ..
+            zh_Hant_HK.Big5HKSCS
+            ..
+            zh_Hant_HK.UTF-8
+            ..
+            zh_Hant_TW.Big5
+            ..
+            zh_Hant_TW.UTF-8
             ..
             zh_HK.Big5HKSCS
             ..
@@ -1259,22 +1309,8 @@
             ..
             ko_KR.eucKR
             ..
-            la_LN.ISO8859-1
-            ..
-            la_LN.ISO8859-13
-            ..
-            la_LN.ISO8859-15
-            ..
-            la_LN.ISO8859-2
-            ..
-            la_LN.ISO8859-4
-            ..
-            la_LN.US-ASCII
-            ..
             lt_LT.ISO8859-13
             ..
-            lt_LT.ISO8859-4
-            ..
             lt_LT.UTF-8
             ..
             lv_LV.ISO8859-13
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index d12e415..46b8dcd 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -46,6 +46,8 @@
         ..
         ipf             mode=0700
         ..
+        ntp             mode=0700
+        ..
         pkg
         ..
         ports
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index afed370..d8df25d 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -5,6 +5,8 @@
 FILES=	${_BSD.debug.dist} \
 	BSD.include.dist \
 	BSD.root.dist \
+	${_BSD.lib32.dist} \
+	${_BSD.libsoft.dist} \
 	${_BSD.sendmail.dist} \
 	${_BSD.tests.dist} \
 	BSD.usr.dist \
@@ -16,6 +18,12 @@ _BSD.debug.dist=	BSD.debug.dist
 .if ${MK_GROFF} != "no"
 _BSD.groff.dist=	BSD.groff.dist
 .endif
+.if ${MK_LIB32} != "no"
+_BSD.lib32.dist=	BSD.lib32.dist
+.endif
+.if ${MK_LIBSOFT} != "no"
+_BSD.libsoft.dist=	BSD.libsoft.dist
+.endif
 .if ${MK_SENDMAIL} != "no"
 _BSD.sendmail.dist=	BSD.sendmail.dist
 .endif
diff --git a/etc/netstart b/etc/netstart
index 4adcae2..e499596 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -34,9 +34,6 @@
 # the network by hand, this script will do it for you).
 #
 
-. /etc/rc.subr
-
-load_rc_config 'XXX'
 _start=quietstart
 
 /etc/rc.d/devd ${_start}
diff --git a/etc/newsyslog.conf.d/Makefile.depend b/etc/newsyslog.conf.d/Makefile.depend
new file mode 100644
index 0000000..f80275d
--- /dev/null
+++ b/etc/newsyslog.conf.d/Makefile.depend
@@ -0,0 +1,11 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
diff --git a/etc/ntp.conf b/etc/ntp.conf
index ea39877..c4ad0aa 100644
--- a/etc/ntp.conf
+++ b/etc/ntp.conf
@@ -77,3 +77,8 @@ restrict 127.127.1.0
 #
 #server 127.127.1.0
 #fudge 127.127.1.0 stratum 10
+
+# See http://support.ntp.org/bin/view/Support/ConfiguringNTP#Section_6.14.
+# for documentation regarding leapfile. Updates to the file can be obtained
+# from ftp://time.nist.gov/pub/ or ftp://tycho.usno.navy.mil/pub/ntp/.
+leapfile "/etc/ntp/leap-seconds"
diff --git a/etc/ntp/Makefile b/etc/ntp/Makefile
new file mode 100644
index 0000000..f1aff4f
--- /dev/null
+++ b/etc/ntp/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILES=	leap-seconds
+
+FILESDIR=	/etc/ntp
+FILESMODE=	644
+
+.include <bsd.prog.mk>
diff --git a/etc/ntp/leap-seconds b/etc/ntp/leap-seconds
new file mode 100644
index 0000000..8fa6225
--- /dev/null
+++ b/etc/ntp/leap-seconds
@@ -0,0 +1,221 @@
+#
+# $FreeBSD$
+#
+#	In the following text, the symbol '#' introduces
+#	a comment, which continues from that symbol until 
+#	the end of the line. A plain comment line has a
+#	whitespace character following the comment indicator.
+#	There are also special comment lines defined below. 
+#	A special comment will always have a non-whitespace 
+#	character in column 2.
+#
+#	A blank line should be ignored.
+#
+#	The following table shows the corrections that must
+#	be applied to compute International Atomic Time (TAI)
+#	from the Coordinated Universal Time (UTC) values that
+#	are transmitted by almost all time services.
+#
+#	The first column shows an epoch as a number of seconds
+#	since 1900.0 and the second column shows the number of
+#	seconds that must be added to UTC to compute TAI for
+#	any timestamp at or after that epoch. The value on 
+#	each line is valid from the indicated initial instant
+#	until the epoch given on the next one or indefinitely 
+#	into the future if there is no next line.
+#	(The comment on each line shows the representation of
+#	the corresponding initial epoch in the usual 
+#	day-month-year format. The epoch always begins at
+#	00:00:00 UTC on the indicated day. See Note 5 below.)
+#	
+#	Important notes:
+#
+#	1. Coordinated Universal Time (UTC) is often referred to
+#	as Greenwich Mean Time (GMT). The GMT time scale is no
+#	longer used, and the use of GMT to designate UTC is
+#	discouraged.
+#
+#	2. The UTC time scale is realized by many national 
+#	laboratories and timing centers. Each laboratory
+#	identifies its realization with its name: Thus
+#	UTC(NIST), UTC(USNO), etc. The differences among
+#	these different realizations are typically on the
+#	order of a few nanoseconds (i.e., 0.000 000 00x s)
+#	and can be ignored for many purposes. These differences
+#	are tabulated in Circular T, which is published monthly
+#	by the International Bureau of Weights and Measures
+#	(BIPM). See www.bipm.fr for more information.
+#
+#	3. The current defintion of the relationship between UTC 
+#	and TAI dates from 1 January 1972. A number of different 
+#	time scales were in use before than epoch, and it can be 
+#	quite difficult to compute precise timestamps and time 
+#	intervals in those "prehistoric" days. For more information,
+#	consult:
+#
+#		The Explanatory Supplement to the Astronomical
+#		Ephemeris.
+#	or
+#		Terry Quinn, "The BIPM and the Accurate Measurement
+#		of Time," Proc. of the IEEE, Vol. 79, pp. 894-905,
+#		July, 1991.
+#
+#	4.  The insertion of leap seconds into UTC is currently the
+#	responsibility of the International Earth Rotation Service,
+#	which is located at the Paris Observatory: 
+#
+#	Central Bureau of IERS
+#	61, Avenue de l'Observatoire
+#	75014 Paris, France.
+#
+#	Leap seconds are announced by the IERS in its Bulletin C
+#
+#	See hpiers.obspm.fr or www.iers.org for more details.
+#
+#	All national laboratories and timing centers use the
+#	data from the BIPM and the IERS to construct their
+#	local realizations of UTC.
+#
+#	Although the definition also includes the possibility
+#	of dropping seconds ("negative" leap seconds), this has 
+#	never been done and is unlikely to be necessary in the 
+#	foreseeable future.
+#
+#	5. If your system keeps time as the number of seconds since
+#	some epoch (e.g., NTP timestamps), then the algorithm for
+#	assigning a UTC time stamp to an event that happens during a positive
+#	leap second is not well defined. The official name of that leap 
+#	second is 23:59:60, but there is no way of representing that time 
+#	in these systems. 
+#	Many systems of this type effectively stop the system clock for 
+#	one second during the leap second and use a time that is equivalent 
+#	to 23:59:59 UTC twice. For these systems, the corresponding TAI 
+#	timestamp would be obtained by advancing to the next entry in the
+#	following table when the time equivalent to 23:59:59 UTC
+#	is used for the second time. Thus the leap second which
+#	occurred on 30 June 1972 at 23:59:59 UTC would have TAI
+#	timestamps computed as follows:
+#
+#	...
+#	30 June 1972 23:59:59 (2287785599, first time):	TAI= UTC + 10 seconds
+#	30 June 1972 23:59:60 (2287785599,second time):	TAI= UTC + 11 seconds
+#	1  July 1972 00:00:00 (2287785600)		TAI= UTC + 11 seconds
+#	...
+#
+#	If your system realizes the leap second by repeating 00:00:00 UTC twice
+#	(this is possible but not usual), then the advance to the next entry
+#	in the table must occur the second time that a time equivlent to 
+#	00:00:00 UTC is used. Thus, using the same example as above:
+#
+#	...
+#       30 June 1972 23:59:59 (2287785599):		TAI= UTC + 10 seconds
+#       30 June 1972 23:59:60 (2287785600, first time):	TAI= UTC + 10 seconds
+#       1  July 1972 00:00:00 (2287785600,second time):	TAI= UTC + 11 seconds
+#	...
+#
+#	in both cases the use of timestamps based on TAI produces a smooth
+#	time scale with no discontinuity in the time interval.
+#
+#	This complexity would not be needed for negative leap seconds (if they 
+#	are ever used). The UTC time would skip 23:59:59 and advance from 
+#	23:59:58 to 00:00:00 in that case.  The TAI offset would decrease by 
+#	1 second at the same instant.  This is a much easier situation to deal 
+#	with, since the difficulty of unambiguously representing the epoch 
+#	during the leap second does not arise.
+#
+#	Questions or comments to:
+#		Jeff Prillaman
+#		Time Service Department
+#		US Naval Observatory
+#		Washington, DC
+#		jeffrey.prillaman@usno.navy.mil
+#
+#	Last Update of leap second values:  31 Dec 2015
+#
+#	The following line shows this last update date in NTP timestamp 
+#	format. This is the date on which the most recent change to
+#	the leap second data was added to the file. This line can
+#	be identified by the unique pair of characters in the first two 
+#	columns as shown below.
+#
+#$	 3660508800
+#
+#	The data in this file will be updated periodically as new leap 
+#	seconds are announced. In addition to being entered on the line
+#	above, the update time (in NTP format) will be added to the basic 
+#	file name leap-seconds to form the name leap-seconds.<NTP TIME>.
+#	In addition, the generic name leap-seconds.list will always point to 
+#	the most recent version of the file.
+#
+#	This update procedure will be performed only when a new leap second
+#	is announced. 
+#
+#	The following entry specifies the expiration date of the data
+#	in this file in units of seconds since 1900.0.  This expiration date 
+#	will be changed at least twice per year whether or not a new leap 
+#	second is announced. These semi-annual changes will be made no
+#	later than 1 June and 1 December of each year to indicate what
+#	action (if any) is to be taken on 30 June and 31 December, 
+#	respectively. (These are the customary effective dates for new
+#	leap seconds.) This expiration date will be identified by a
+#	unique pair of characters in columns 1 and 2 as shown below.
+#	In the unlikely event that a leap second is announced with an 
+#	effective date other than 30 June or 31 December, then this
+#	file will be edited to include that leap second as soon as it is
+#	announced or at least one month before the effective date
+#	(whichever is later). 
+#	If an announcement by the IERS specifies that no leap second is 
+#	scheduled, then only the expiration date of the file will 
+#	be advanced to show that the information in the file is still
+#	current -- the update time stamp, the data and the name of the file 
+#	will not change.
+#
+#	Updated through IERS Bulletin C 50
+#	File expires on:  1 Jun 2016
+#
+#@	3673728000
+#
+2272060800	10	# 1 Jan 1972
+2287785600	11	# 1 Jul 1972
+2303683200	12	# 1 Jan 1973
+2335219200	13	# 1 Jan 1974
+2366755200	14	# 1 Jan 1975
+2398291200	15	# 1 Jan 1976
+2429913600	16	# 1 Jan 1977
+2461449600	17	# 1 Jan 1978
+2492985600	18	# 1 Jan 1979
+2524521600	19	# 1 Jan 1980
+2571782400	20	# 1 Jul 1981
+2603318400	21	# 1 Jul 1982
+2634854400	22	# 1 Jul 1983
+2698012800	23	# 1 Jul 1985
+2776982400	24	# 1 Jan 1988
+2840140800	25	# 1 Jan 1990
+2871676800	26	# 1 Jan 1991
+2918937600	27	# 1 Jul 1992
+2950473600	28	# 1 Jul 1993
+2982009600	29	# 1 Jul 1994
+3029443200	30	# 1 Jan 1996
+3076704000	31	# 1 Jul 1997
+3124137600	32	# 1 Jan 1999
+3345062400	33	# 1 Jan 2006
+3439756800	34	# 1 Jan 2009
+3550089600	35	# 1 Jul 2012
+3644697600	36	# 1 Jul 2015
+#
+#	the following special comment contains the
+#	hash value of the data in this file computed
+#	use the secure hash algorithm as specified
+#	by FIPS 180-1. See the files in ~/sha for
+#	the details of how this hash value is
+#	computed. Note that the hash computation
+#	ignores comments and whitespace characters
+#	in data lines. It includes the NTP values
+#	of both the last modification time and the 
+#	expiration time of the file, but not the
+#	white space on those lines.
+#	the hash line is also ignored in the
+#	computation.
+#
+#h	44a44c49 35b22601 a9c7054c 8c56cf57 9b6f6ed5
+#
diff --git a/etc/periodic/Makefile b/etc/periodic/Makefile
index 8fb56df..a2d9902 100644
--- a/etc/periodic/Makefile
+++ b/etc/periodic/Makefile
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
 SUBDIR=	daily security weekly monthly
+SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>
diff --git a/etc/periodic/daily/400.status-disks b/etc/periodic/daily/400.status-disks
index dd828aa..bab2810 100755
--- a/etc/periodic/daily/400.status-disks
+++ b/etc/periodic/daily/400.status-disks
@@ -16,7 +16,12 @@ case "$daily_status_disks_enable" in
 	echo ""
 	echo "Disk status:"
 
-	df $daily_status_disks_df_flags && rc=1 || rc=3
+	if [ -n "${daily_status_disks_ignore}" ] ; then
+		ignore="egrep -v ${daily_status_disks_ignore}"
+	else
+		ignore="cat"
+	fi
+	(df $daily_status_disks_df_flags | ${ignore}) && rc=1 || rc=3
 
 	# display which filesystems need backing up
 	if [ -s /etc/dumpdates ]; then
diff --git a/etc/periodic/daily/430.status-rwho b/etc/periodic/daily/430.status-uptime
index 4476136..0c8c591 100755
--- a/etc/periodic/daily/430.status-rwho
+++ b/etc/periodic/daily/430.status-uptime
@@ -11,7 +11,7 @@ then
     source_periodic_confs
 fi
 
-case "$daily_status_rwho_enable" in
+case "$daily_status_uptime_enable" in
     [Yy][Ee][Ss])
 	rwho=$(echo /var/rwho/*)
         if [ -f "${rwho%% *}" ]
diff --git a/etc/periodic/daily/800.scrub-zfs b/etc/periodic/daily/800.scrub-zfs
index ee0e52a..359be13 100755
--- a/etc/periodic/daily/800.scrub-zfs
+++ b/etc/periodic/daily/800.scrub-zfs
@@ -43,6 +43,10 @@ case "$daily_scrub_zfs_enable" in
 			rc=3
 			echo "Skipping faulted pool: ${pool}"
 			continue ;;
+		*UNAVAIL*)
+			rc=4
+			echo "Skipping unavailable pool: ${pool}"
+			continue ;;
 		esac
 
 		# determine how many days shall be between scrubs
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 15b6ae8..939dd15 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -15,6 +15,7 @@ FILES=	100.clean-disks \
 	408.status-gstripe \
 	409.status-gconcat \
 	420.status-network \
+	430.status-uptime \
 	450.status-security \
 	510.status-world-kernel \
 	999.local
@@ -38,8 +39,7 @@ FILES+=	480.status-ntpd
 .endif
 
 .if ${MK_RCMDS} != "no"
-FILES+=	140.clean-rwho \
-	430.status-rwho
+FILES+=	140.clean-rwho
 .endif
 
 .if ${MK_SENDMAIL} != "no"
diff --git a/etc/periodic/security/520.pfdenied b/etc/periodic/security/520.pfdenied
index 7a32bf2..3fea360 100755
--- a/etc/periodic/security/520.pfdenied
+++ b/etc/periodic/security/520.pfdenied
@@ -44,7 +44,7 @@ rc=0
 if check_yesno_period security_status_pfdenied_enable
 then
 	TMP=`mktemp -t security`
-	if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); print buf$0;} }' > ${TMP}; then
+	if pfctl -sr -v 2>/dev/null | nawk '{if (/^block/) {buf=$0; getline; gsub(" +"," ",$0); if ($5 > 0) print buf$0;} }' > ${TMP}; then
 	  check_diff new_only pf ${TMP} "${host} pf denied packets:"
 	fi
 	rc=$?
diff --git a/etc/rc b/etc/rc
index 4efc293..2c90f38 100644
--- a/etc/rc
+++ b/etc/rc
@@ -131,11 +131,14 @@ done
 
 # Remove the firstboot sentinel, and reboot if it was requested.
 if [ -e ${firstboot_sentinel} ]; then
-	rm ${firstboot_sentinel}
+	[ ${root_rw_mount} = "yes" ] || mount -uw /
+	/bin/rm ${firstboot_sentinel}
 	if [ -e ${firstboot_sentinel}-reboot ]; then
-		rm ${firstboot_sentinel}-reboot
+		/bin/rm ${firstboot_sentinel}-reboot
+		[ ${root_rw_mount} = "yes" ] || mount -ur /
 		kill -INT 1
 	fi
+	[ ${root_rw_mount} = "yes" ] || mount -ur /
 fi
 
 echo ''
diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING
index 2294628..92ba05d 100755
--- a/etc/rc.d/NETWORKING
+++ b/etc/rc.d/NETWORKING
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: NETWORKING NETWORK
-# REQUIRE: netif netoptions routing ppp ipfw stf
+# REQUIRE: netif netwait netoptions routing ppp ipfw stf
 # REQUIRE: defaultroute routed route6d mroute6d resolv bridge
 # REQUIRE: static_arp static_ndp
 
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index 3c55edf..a1b4bbc 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -28,16 +28,16 @@ extra_commands="config console status"
 
 need_dad_wait=
 
-# extract_var jail name param num defval
-#	Extract value from ${jail_$jail_$name} or ${jail_$name} and
+# extract_var jv name param num defval
+#	Extract value from ${jail_$jv_$name} or ${jail_$name} and
 #	set it to $param.  If not defined, $defval is used.
-#	When $num is [0-9]*, ${jail_$jail_$name$num} are looked up and
+#	When $num is [0-9]*, ${jail_$jv_$name$num} are looked up and
 #	$param is set by using +=.
 #	When $num is YN or NY, the value is interpret as boolean.
 extract_var()
 {
-	local i _j _name _param _num _def _name1 _name2
-	_j=$1
+	local i _jv _name _param _num _def _name1 _name2
+	_jv=$1
 	_name=$2
 	_param=$3
 	_num=$4
@@ -45,7 +45,7 @@ extract_var()
 
 	case $_num in
 	YN)
-		_name1=jail_${_j}_${_name}
+		_name1=jail_${_jv}_${_name}
 		_name2=jail_${_name}
 		eval $_name1=\"\${$_name1:-\${$_name2:-$_def}}\"
 		if checkyesno $_name1; then
@@ -55,7 +55,7 @@ extract_var()
 		fi
 	;;
 	NY)
-		_name1=jail_${_j}_${_name}
+		_name1=jail_${_jv}_${_name}
 		_name2=jail_${_name}
 		eval $_name1=\"\${$_name1:-\${$_name2:-$_def}}\"
 		if checkyesno $_name1; then
@@ -67,7 +67,7 @@ extract_var()
 	[0-9]*)
 		i=$_num
 		while : ; do
-			_name1=jail_${_j}_${_name}${i}
+			_name1=jail_${_jv}_${_name}${i}
 			_name2=jail_${_name}${i}
 			eval _tmpargs=\"\${$_name1:-\${$_name2:-$_def}}\"
 			if [ -n "$_tmpargs" ]; then 
@@ -79,7 +79,7 @@ extract_var()
 		done
 	;;
 	*)
-		_name1=jail_${_j}_${_name}
+		_name1=jail_${_jv}_${_name}
 		_name2=jail_${_name}
 		eval _tmpargs=\"\${$_name1:-\${$_name2:-$_def}}\"
 		if [ -n "$_tmpargs" ]; then
@@ -89,22 +89,23 @@ extract_var()
 	esac
 }
 
-# parse_options _j
+# parse_options _j _jv
 #	Parse options and create a temporary configuration file if necessary.
 #
 parse_options()
 {
-	local _j _p
+	local _j _jv _p
 	_j=$1
+	_jv=$2
 
 	_confwarn=0
 	if [ -z "$_j" ]; then
 		warn "parse_options: you must specify a jail"
 		return
 	fi
-	eval _jconf=\"\${jail_${_j}_conf:-/etc/jail.${_j}.conf}\"
-	eval _rootdir=\"\$jail_${_j}_rootdir\"
-	eval _hostname=\"\$jail_${_j}_hostname\"
+	eval _jconf=\"\${jail_${_jv}_conf:-/etc/jail.${_j}.conf}\"
+	eval _rootdir=\"\$jail_${_jv}_rootdir\"
+	eval _hostname=\"\$jail_${_jv}_hostname\"
 	if [ -z "$_rootdir" -o \
 	     -z "$_hostname" ]; then
 		if [ -r "$_jconf" ]; then
@@ -120,7 +121,7 @@ parse_options()
 		fi
 		return 1
 	fi
-	eval _ip=\"\$jail_${_j}_ip\"
+	eval _ip=\"\$jail_${_jv}_ip\"
 	if [ -z "$_ip" ] && ! check_kern_features vimage; then
 		warn "no ipaddress specified and no vimage support.  " \
 		    "Jail $_j was ignored."
@@ -138,10 +139,10 @@ parse_options()
 	fi
 	/usr/bin/install -m 0644 -o root -g wheel /dev/null $_conf || return 1
 
-	eval : \${jail_${_j}_flags:=${jail_flags}}
-	eval _exec=\"\$jail_${_j}_exec\"
-	eval _exec_start=\"\$jail_${_j}_exec_start\"
-	eval _exec_stop=\"\$jail_${_j}_exec_stop\"
+	eval : \${jail_${_jv}_flags:=${jail_flags}}
+	eval _exec=\"\$jail_${_jv}_exec\"
+	eval _exec_start=\"\$jail_${_jv}_exec_start\"
+	eval _exec_stop=\"\$jail_${_jv}_exec_stop\"
 	if [ -n "${_exec}" ]; then
 		#   simple/backward-compatible execution
 		_exec_start="${_exec}"
@@ -155,20 +156,20 @@ parse_options()
 			fi
 		fi
 	fi
-	eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\"
-	eval _parameters=\"\${jail_${_j}_parameters:-${jail_parameters}}\"
-	eval _fstab=\"\${jail_${_j}_fstab:-${jail_fstab:-/etc/fstab.$_j}}\"
+	eval _interface=\"\${jail_${_jv}_interface:-${jail_interface}}\"
+	eval _parameters=\"\${jail_${_jv}_parameters:-${jail_parameters}}\"
+	eval _fstab=\"\${jail_${_jv}_fstab:-${jail_fstab:-/etc/fstab.$_j}}\"
 	(
 		date +"# Generated by rc.d/jail at %Y-%m-%d %H:%M:%S"
 		echo "$_j {"
-		extract_var $_j hostname host.hostname - ""
-		extract_var $_j rootdir path - ""
+		extract_var $_jv hostname host.hostname - ""
+		extract_var $_jv rootdir path - ""
 		if [ -n "$_ip" ]; then
-			extract_var $_j interface interface - ""
+			extract_var $_jv interface interface - ""
 			jail_handle_ips_option $_ip $_interface
 			alias=0
 			while : ; do
-				eval _x=\"\$jail_${_j}_ip_multi${alias}\"
+				eval _x=\"\$jail_${_jv}_ip_multi${alias}\"
 				[ -z "$_x" ] && break
 
 				jail_handle_ips_option $_x $_interface
@@ -184,37 +185,37 @@ parse_options()
 			;;
 			esac
 			# These are applicable only to non-vimage jails. 
-			extract_var $_j fib exec.fib - ""
-			extract_var $_j socket_unixiproute_only \
+			extract_var $_jv fib exec.fib - ""
+			extract_var $_jv socket_unixiproute_only \
 			    allow.raw_sockets NY YES
 		else
 			echo "	vnet;"
-			extract_var $_j vnet_interface vnet.interface - ""
+			extract_var $_jv vnet_interface vnet.interface - ""
 		fi
 
 		echo "	exec.clean;"
 		echo "	exec.system_user = \"root\";"
 		echo "	exec.jail_user = \"root\";"
-		extract_var $_j exec_prestart exec.prestart 0 ""
-		extract_var $_j exec_poststart exec.poststart 0 ""
-		extract_var $_j exec_prestop exec.prestop 0 ""
-		extract_var $_j exec_poststop exec.poststop 0 ""
+		extract_var $_jv exec_prestart exec.prestart 0 ""
+		extract_var $_jv exec_poststart exec.poststart 0 ""
+		extract_var $_jv exec_prestop exec.prestop 0 ""
+		extract_var $_jv exec_poststop exec.poststop 0 ""
 
 		echo "	exec.start += \"$_exec_start\";"
-		extract_var $_j exec_afterstart exec.start 1 ""
+		extract_var $_jv exec_afterstart exec.start 1 ""
 		echo "	exec.stop = \"$_exec_stop\";"
 
-		extract_var $_j consolelog exec.consolelog - \
+		extract_var $_jv consolelog exec.consolelog - \
 		    /var/log/jail_${_j}_console.log
 
 		if [ -r $_fstab ]; then
 			echo "	mount.fstab = \"$_fstab\";"
 		fi
 
-		eval : \${jail_${_j}_devfs_enable:=${jail_devfs_enable:-NO}}
-		if checkyesno jail_${_j}_devfs_enable; then
+		eval : \${jail_${_jv}_devfs_enable:=${jail_devfs_enable:-NO}}
+		if checkyesno jail_${_jv}_devfs_enable; then
 			echo "	mount.devfs;"
-			eval _ruleset=\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}
+			eval _ruleset=\${jail_${_jv}_devfs_ruleset:-${jail_devfs_ruleset}}
 			case $_ruleset in
 			"")	;;
 			[0-9]*) echo "	devfs_ruleset = \"$_ruleset\";" ;;
@@ -227,22 +228,24 @@ parse_options()
 			*)	warn "devfs_ruleset must be an integer." ;;
 			esac
 		fi
-		eval : \${jail_${_j}_fdescfs_enable:=${jail_fdescfs_enable:-NO}}
-		if checkyesno jail_${_j}_fdescfs_enable; then
+		eval : \${jail_${_jv}_fdescfs_enable:=${jail_fdescfs_enable:-NO}}
+		if checkyesno jail_${_jv}_fdescfs_enable; then
 			echo "	mount.fdescfs;"
 		fi
-		eval : \${jail_${_j}_procfs_enable:=${jail_procfs_enable:-NO}}
-		if checkyesno jail_${_j}_procfs_enable; then
+		eval : \${jail_${_jv}_procfs_enable:=${jail_procfs_enable:-NO}}
+		if checkyesno jail_${_jv}_procfs_enable; then
 			echo "	mount.procfs;"
 		fi
 
-		eval : \${jail_${_j}_mount_enable:=${jail_mount_enable:-NO}}
-		if checkyesno jail_${_j}_mount_enable; then
+		eval : \${jail_${_jv}_mount_enable:=${jail_mount_enable:-NO}}
+		if checkyesno jail_${_jv}_mount_enable; then
 			echo "	allow.mount;"
 		fi
 
-		extract_var $_j set_hostname_allow allow.set_hostname YN NO
-		extract_var $_j sysvipc_allow allow.sysvipc YN NO
+		extract_var $_jv set_hostname_allow allow.set_hostname YN NO
+		extract_var $_jv sysvipc_allow allow.sysvipc YN NO
+		extract_var $_jv osreldate osreldate
+		extract_var $_jv osrelease osrelease
 		for _p in $_parameters; do
 			echo "	${_p%\;};"
 		done
@@ -380,14 +383,15 @@ jail_handle_ips_option()
 
 jail_config()
 {
-	local _j
+	local _j _jv
 
 	case $1 in
 	_ALL)	return ;;
 	esac
 	for _j in $@; do
 		_j=$(echo $_j | tr /. _)
-		if parse_options $_j; then 
+		_jv=$(echo -n $_j | tr -c '[:alnum:]' _)
+		if parse_options $_j $_jv; then 
 			echo "$_j: parameters are in $_conf."
 		fi
 	done
@@ -395,7 +399,7 @@ jail_config()
 
 jail_console()
 {
-	local _j _cmd
+	local _j _jv _cmd
 
 	# One argument that is not _ALL.
 	case $#:$1 in
@@ -403,9 +407,10 @@ jail_console()
 	1:*)		;;
 	esac
 	_j=$(echo $1 | tr /. _)
+	_jv=$(echo -n $1 | tr -c '[:alnum:]' _)
 	shift
 	case $# in
-	0)	eval _cmd=\${jail_${_j}_consolecmd:-$jail_consolecmd} ;;
+	0)	eval _cmd=\${jail_${_jv}_consolecmd:-$jail_consolecmd} ;;
 	*)	_cmd=$@ ;;
 	esac
 	$jail_jexec $_j $_cmd
@@ -419,7 +424,7 @@ jail_status()
 
 jail_start()
 {
-	local _j _jid _jl _id _name
+	local _j _jv _jid _jl _id _name
 
 	if [ $# = 0 ]; then
 		return
@@ -452,11 +457,12 @@ jail_start()
 		_jl=
 		for _j in $@; do
 			_j=$(echo $_j | tr /. _)
-			parse_options $_j || continue
+			_jv=$(echo -n $_j | tr -c '[:alnum:]' _)
+			parse_options $_j $_jv || continue
 
 			_jl="$_jl $_j"
-			eval rc_flags=\${jail_${_j}_flags:-$jail_flags}
-			eval command=\${jail_${_j}_program:-$jail_program}
+			eval rc_flags=\${jail_${_jv}_flags:-$jail_flags}
+			eval command=\${jail_${_jv}_program:-$jail_program}
 			command_args="-i -f $_conf -c $_j"
 			$command $rc_flags $command_args \
 			    >/dev/null 2>&1 </dev/null &
@@ -478,10 +484,11 @@ jail_start()
 		#
 		for _j in $@; do
 			_j=$(echo $_j | tr /. _)
-			parse_options $_j || continue
+			_jv=$(echo -n $_j | tr -c '[:alnum:]' _)
+			parse_options $_j $_jv || continue
 
-			eval rc_flags=\${jail_${_j}_flags:-$jail_flags}
-			eval command=\${jail_${_j}_program:-$jail_program}
+			eval rc_flags=\${jail_${_jv}_flags:-$jail_flags}
+			eval command=\${jail_${_jv}_program:-$jail_program}
 			command_args="-i -f $_conf -c $_j"
 			_tmp=`mktemp -t jail` || exit 3
 			if $command $rc_flags $command_args \
@@ -503,7 +510,7 @@ jail_start()
 
 jail_stop()
 {
-	local _j
+	local _j _jv
 
 	if [ $# = 0 ]; then
 		return
@@ -531,11 +538,12 @@ jail_stop()
 	esac
 	for _j in $@; do
 		_j=$(echo $_j | tr /. _)
-		parse_options $_j || continue
+		_jv=$(echo -n $_j | tr -c '[:alnum:]' _)
+		parse_options $_j $_jv || continue
 		if ! $jail_jls -j $_j > /dev/null 2>&1; then
 			continue
 		fi
-		eval command=\${jail_${_j}_program:-$jail_program}
+		eval command=\${jail_${_jv}_program:-$jail_program}
 		echo -n " ${_hostname:-${_j}}"
 		_tmp=`mktemp -t jail` || exit 3
 		$command -q -f $_conf -r $_j >> $_tmp 2>&1
diff --git a/etc/rc.d/local_unbound b/etc/rc.d/local_unbound
index ce3256d..0cd1ff3 100755
--- a/etc/rc.d/local_unbound
+++ b/etc/rc.d/local_unbound
@@ -17,12 +17,15 @@ rcvar="local_unbound_enable"
 command="/usr/sbin/unbound"
 extra_commands="anchor configtest reload setup"
 start_precmd="local_unbound_prestart"
+start_postcmd="local_unbound_poststart"
 reload_precmd="local_unbound_configtest"
 anchor_cmd="local_unbound_anchor"
 configtest_cmd="local_unbound_configtest"
 setup_cmd="local_unbound_setup"
 pidfile="/var/run/${name}.pid"
 
+load_rc_config $name
+
 : ${local_unbound_workdir:=/var/unbound}
 : ${local_unbound_config:=${local_unbound_workdir}/unbound.conf}
 : ${local_unbound_flags:="-c ${local_unbound_config}"}
@@ -31,8 +34,6 @@ pidfile="/var/run/${name}.pid"
 : ${local_unbound_anchor:=${local_unbound_workdir}/root.key}
 : ${local_unbound_forwarders:=}
 
-load_rc_config $name
-
 do_as_unbound()
 {
 	echo "$@" | su -m unbound
@@ -90,5 +91,25 @@ local_unbound_prestart()
 	fi
 }
 
+#
+# After starting, wait for Unbound to report that it is ready to avoid
+# race conditions with services which require functioning DNS.
+#
+local_unbound_poststart()
+{
+	local retry=5
+
+	echo -n "Waiting for nameserver to start..."
+	until "${command}-control" status | grep -q "is running" ; do
+		if [ $((retry -= 1)) -eq 0 ] ; then
+			echo " giving up"
+			return 1
+		fi
+		echo -n "."
+		sleep 1
+	done
+	echo " good"
+}
+
 load_rc_config $name
 run_rc_command "$1"
diff --git a/etc/rc.d/mdconfig b/etc/rc.d/mdconfig
index 627da87..fecdef6 100755
--- a/etc/rc.d/mdconfig
+++ b/etc/rc.d/mdconfig
@@ -186,6 +186,8 @@ if [ -z "${_mdconfig_list}" ]; then
 		sort_lite -nk1.12`
 	do
 		_mdconfig_unit=${_mdconfig_config#mdconfig_md}
+		[ "${_mdconfig_unit#*[!0-9]}" = "$_mdconfig_unit" ] ||
+			continue
 		_mdconfig_list="$_mdconfig_list md$_mdconfig_unit"
 	done
 	_mdconfig_list="${_mdconfig_list# }"
diff --git a/etc/rc.d/mdconfig2 b/etc/rc.d/mdconfig2
index 85fd07f..234459f 100755
--- a/etc/rc.d/mdconfig2
+++ b/etc/rc.d/mdconfig2
@@ -216,6 +216,8 @@ if [ -z "${_mdconfig2_list}" ]; then
 		sort_lite -nk1.12`
 	do
 		_mdconfig2_unit=${_mdconfig2_config#mdconfig_md}
+		[ "${_mdconfig2_unit#*[!0-9]}" = "$_mdconfig2_unit" ] ||
+			continue
 		_mdconfig2_list="$_mdconfig2_list md$_mdconfig2_unit"
 	done
 	_mdconfig2_list="${_mdconfig2_list# }"
diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal
index 06bf464..1513ec7 100755
--- a/etc/rc.d/mountcritlocal
+++ b/etc/rc.d/mountcritlocal
@@ -15,7 +15,7 @@ stop_cmd=sync
 
 mountcritlocal_start()
 {
-	local err
+	local err holders waited
 
 	# Set up the list of network filesystem types for which mounting
 	# should be delayed until after network initialization.
@@ -35,8 +35,42 @@ mountcritlocal_start()
 		mount_excludes="${mount_excludes}${fstype},"
 	done
 	mount_excludes=${mount_excludes%,}
+
+	# Originally, root mount hold had to be released before mounting the root
+	# filesystem.  This delayed the boot, so it was changed to only wait if
+	# the root device isn't readily available.  This can result in this script
+	# executing before all the devices - such as graid(8) - are available.
+	# Thus, should the mount fail, we will wait for the root mount hold release
+	# and retry.
 	mount -a -t ${mount_excludes}
 	err=$?
+	if [ $? -ne 0 ]; then
+		echo
+		echo 'Mounting /etc/fstab filesystems failed,' \
+		    'will retry after root mount hold release'
+
+		waited=0
+		while [ ${waited} -lt ${root_hold_delay} ]; do
+			holders="$(sysctl -n vfs.root_mount_hold)"
+			if [ -z "${holders}" ]; then
+				break;
+			fi
+			if [ ${waited} -eq 0 ]; then
+				echo -n "Waiting ${root_hold_delay}s" \
+				"for the root mount holders: ${holders}"
+			else
+				echo -n .
+			fi
+			if [ ${waited} -eq ${root_hold_delay} ]; then
+				break 2
+			fi
+			sleep 1
+			waited=$(($waited + 1))
+		done
+		mount -a -t ${mount_excludes}
+		err=$?
+	fi
+
 	check_startmsgs && echo '.'
 
 	case ${err} in
@@ -44,7 +78,7 @@ mountcritlocal_start()
 		;;
 	*)
 		echo 'Mounting /etc/fstab filesystems failed,' \
-		    ' startup aborted'
+		    'startup aborted'
 		stop_boot true
 		;;
 	esac
diff --git a/etc/rc.d/netwait b/etc/rc.d/netwait
index 7ea7a4c..6ccca04 100755
--- a/etc/rc.d/netwait
+++ b/etc/rc.d/netwait
@@ -3,13 +3,20 @@
 # $FreeBSD$
 #
 # PROVIDE: netwait
-# REQUIRE: NETWORKING
+# REQUIRE: devd routing
 # KEYWORD: nojail
 #
-# The netwait script is intended to be used by systems which have
-# statically-configured IP addresses in rc.conf(5).  If your system
-# uses DHCP, you should use synchronous_dhclient="YES" in your
-# /etc/rc.conf instead of using netwait.
+# The netwait script helps handle two situations:
+#  - Systems with USB or other late-attaching network hardware which
+#    is initialized by devd events.  The script waits for all the
+#    interfaces named in the netwait_if list to appear.
+#  - Systems with statically-configured IP addresses in rc.conf(5).
+#    The IP addresses in the netwait_ip list are pinged.  The script
+#    waits for any single IP in the list to respond to the ping.  If your
+#    system uses DHCP, you should probably use synchronous_dhclient="YES"
+#    in your /etc/rc.conf instead of netwait_ip.
+# Either or both of the wait lists can be used (at least one must be
+# non-empty if netwait is enabled).
 
 . /etc/rc.subr
 
@@ -21,77 +28,87 @@ stop_cmd=":"
 
 netwait_start()
 {
-	local ip rc count output link
+	local ip rc count output link wait_if got_if any_error
 
-	if [ -z "${netwait_ip}" ]; then
-		err 1 "You must define one or more IP addresses in netwait_ip"
+	if [ -z "${netwait_if}" ] && [ -z "${netwait_ip}" ]; then
+		err 1 "No interface or IP addresses listed, nothing to wait for"
 	fi
 
 	if [ ${netwait_timeout} -lt 1 ]; then
 		err 1 "netwait_timeout must be >= 1"
 	fi
 
-	# Handle SIGINT (Ctrl-C); force abort of while() loop
-	trap break SIGINT
-
 	if [ -n "${netwait_if}" ]; then
-		echo -n "Waiting for $netwait_if to have link"
-
-		count=1
-		while [ ${count} -le ${netwait_if_timeout} ]; do
-			if output=`/sbin/ifconfig ${netwait_if} 2>/dev/null`; then
-				link=`expr "${output}" : '.*[[:blank:]]status: \(no carrier\)'`
-				if [ -z "${link}" ]; then
-					echo '.'
-					break
+		any_error=0
+		for wait_if in ${netwait_if}; do
+			echo -n "Waiting for ${wait_if}"
+			link=""
+			got_if=0
+			count=1
+			# Handle SIGINT (Ctrl-C); force abort of while() loop
+			trap break SIGINT
+			while [ ${count} -le ${netwait_if_timeout} ]; do
+				if output=`/sbin/ifconfig ${wait_if} 2>/dev/null`; then
+					if [ ${got_if} -eq 0 ]; then
+						echo -n ", interface present"
+						got_if=1
+					fi
+					link=`expr "${output}" : '.*[[:blank:]]status: \(no carrier\)'`
+					if [ -z "${link}" ]; then
+						echo ', got link.'
+						break
+					fi
 				fi
-			else
-				echo ''
-				err 1 "ifconfig ${netwait_if} failed"
-			fi
-			sleep 1
-			count=$((count+1))
-		done
-		if [ -n "${link}" ]; then
+				sleep 1
+				count=$((count+1))
+			done
 			# Restore default SIGINT handler
 			trap - SIGINT
-
-			echo ''
-			warn "Interface still has no link.  Continuing with startup, but"
-			warn "be aware you may not have a fully functional networking"
-			warn "layer at this point."
-			return
+			if [ ${got_if} -eq 0 ]; then
+				echo ", wait failed: interface never appeared."
+				any_error=1
+			elif [ -n "${link}" ]; then
+				echo ", wait failed: interface still has no link."
+				any_error=1
+			fi
+		done
+		if [ ${any_error} -eq 1 ]; then
+		    warn "Continuing with startup, but be aware you may not have "
+		    warn "a fully functional networking layer at this point."
 		fi
 	fi
+	
+	if [ -n "${netwait_ip}" ]; then
+		# Handle SIGINT (Ctrl-C); force abort of for() loop
+		trap break SIGINT
 
-	# Handle SIGINT (Ctrl-C); force abort of while() loop
-	trap break SIGINT
+		for ip in ${netwait_ip}; do
+			echo -n "Waiting for ${ip} to respond to ICMP ping"
 
-	for ip in ${netwait_ip}; do
-		echo -n "Waiting for ${ip} to respond to ICMP"
+			count=1
+			while [ ${count} -le ${netwait_timeout} ]; do
+				/sbin/ping -t 1 -c 1 -o ${ip} >/dev/null 2>&1
+				rc=$?
 
-		count=1
-		while [ ${count} -le ${netwait_timeout} ]; do
-			/sbin/ping -t 1 -c 1 -o ${ip} >/dev/null 2>&1
-			rc=$?
+				if [ $rc -eq 0 ]; then
+					# Restore default SIGINT handler
+					trap - SIGINT
 
-			if [ $rc -eq 0 ]; then
-				# Restore default SIGINT handler
-				trap - SIGINT
-
-				echo '.'
-				return
-			fi
-			count=$((count+1))
+					echo ', got response.'
+					return
+				fi
+				count=$((count+1))
+			done
+			echo ', failed: No response from host.'
 		done
-		echo ': No response from host.'
-	done
 
-	# Restore default SIGINT handler
-	trap - SIGINT
+		# Restore default SIGINT handler
+		trap - SIGINT
+
+		warn "Exhausted IP list.  Continuing with startup, but be aware you may"
+		warn "not have a fully functional networking layer at this point."
+	fi
 
-	warn "Exhausted IP list.  Continuing with startup, but be aware you may"
-	warn "not have a fully functional networking layer at this point."
 }
 
 load_rc_config $name
diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd
index 8c67308..fefe390 100755
--- a/etc/rc.d/nfsd
+++ b/etc/rc.d/nfsd
@@ -32,9 +32,13 @@ nfsd_precmd()
 		sysctl vfs.nfsd.nfs_privport=0 > /dev/null
 	fi
 
+	if checkyesno nfsv4_server_enable || \
+	    checkyesno nfs_server_managegids; then
+		force_depend nfsuserd || err 1 "Cannot run nfsuserd"
+	fi
+
 	if checkyesno nfsv4_server_enable; then
 		sysctl vfs.nfsd.server_max_nfsvers=4 > /dev/null
-		force_depend nfsuserd || err 1 "Cannot run nfsuserd"
 	else
 		echo 'NFSv4 is disabled'
 		sysctl vfs.nfsd.server_max_nfsvers=3 > /dev/null
diff --git a/etc/rc.d/nfsuserd b/etc/rc.d/nfsuserd
index 52246bb..d98d16e 100755
--- a/etc/rc.d/nfsuserd
+++ b/etc/rc.d/nfsuserd
@@ -15,5 +15,14 @@ command="/usr/sbin/${name}"
 sig_stop="USR1"
 
 load_rc_config $name
+start_precmd="nfsuserd_precmd"
+
+nfsuserd_precmd()
+{
+	if checkyesno nfs_server_managegids; then
+		rc_flags="-manage-gids ${nfsuserd_flags}"
+	fi
+	return 0
+}
 
 run_rc_command "$1"
diff --git a/etc/rc.d/othermta b/etc/rc.d/othermta
index 7ab3e63..36292ae 100755
--- a/etc/rc.d/othermta
+++ b/etc/rc.d/othermta
@@ -10,7 +10,7 @@
 #
 . /etc/rc.subr
 
-load_rc_config 'XXX'
+load_rc_config
 
 if [ -n "${mta_start_script}" ]; then
 	[ "${mta_start_script}" != "/etc/rc.sendmail" ] && \
diff --git a/etc/rc.d/rctl b/etc/rc.d/rctl
index 93b200d..85c0c20 100755
--- a/etc/rc.d/rctl
+++ b/etc/rc.d/rctl
@@ -23,10 +23,10 @@ rctl_start()
 			\#*|'')
 				;;
 			*)
-				rctl -a "${var}"
+				echo "${var}"
 				;;
 			esac
-		done < ${rctl_rules}
+		done < ${rctl_rules} | xargs rctl -a
 	fi
 }
 
diff --git a/etc/rc.d/var b/etc/rc.d/var
index 2be2484..b80fcb0 100755
--- a/etc/rc.d/var
+++ b/etc/rc.d/var
@@ -41,12 +41,12 @@ load_rc_config $name
 
 populate_var()
 {
-	/usr/sbin/mtree -deU -f /etc/mtree/BSD.var.dist -p /var > /dev/null
+	/usr/sbin/mtree -deiU -f /etc/mtree/BSD.var.dist -p /var > /dev/null
 	case ${sendmail_enable} in
 	[Nn][Oo][Nn][Ee])
 		;;
 	*)
-		/usr/sbin/mtree -deU -f /etc/mtree/BSD.sendmail.dist -p / > /dev/null
+		/usr/sbin/mtree -deiU -f /etc/mtree/BSD.sendmail.dist -p / > /dev/null
 		;;
 	esac
 }
diff --git a/etc/rc.shutdown b/etc/rc.shutdown
index a0dd698..15779c7 100644
--- a/etc/rc.shutdown
+++ b/etc/rc.shutdown
@@ -45,7 +45,7 @@ export HOME PATH
 
 . /etc/rc.subr
 
-load_rc_config 'XXX'
+load_rc_config
 
 # reverse_list list
 #	print the list in reverse order
diff --git a/etc/rc.subr b/etc/rc.subr
index cd933c6..a6de452 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -976,6 +976,14 @@ run_rc_command()
 			fi
 		fi
 
+		if [ $rc_arg = "start" -a -z "$rc_fast" -a -n "$rc_pid" ]; then
+			if [ -z "$rc_quiet" ]; then
+				echo 1>&2 "${name} already running? " \
+				    "(pid=$rc_pid)."
+			fi
+			return 1
+		fi
+
 					# if there's a custom ${XXX_cmd},
 					# run that instead of the default
 					#
@@ -1004,14 +1012,6 @@ run_rc_command()
 			;;
 
 		start)
-			if [ -z "$rc_fast" -a -n "$rc_pid" ]; then
-				if [ -z "$rc_quiet" ]; then
-					echo 1>&2 "${name} already running? " \
-					    "(pid=$rc_pid)."
-				fi
-				return 1
-			fi
-
 			if [ ! -x "${_chroot}${_chroot:+/}${command}" ]; then
 				warn "run_rc_command: cannot run $command"
 				return 1
@@ -1316,8 +1316,10 @@ run_rc_script()
 }
 
 #
-# load_rc_config name
-#	Source in the configuration file for a given name.
+# load_rc_config [service]
+#	Source in the configuration file(s) for a given service.
+#	If no service is specified, only the global configuration
+#	file(s) will be loaded.
 #
 load_rc_config()
 {
diff --git a/etc/services b/etc/services
index 3d06be6..dde71fb 100644
--- a/etc/services
+++ b/etc/services
@@ -1029,7 +1029,7 @@ nntps		563/udp	   snntp	#nntp protocol over TLS/SSL
 whoami		565/tcp
 whoami		565/udp
 streettalk	566/tcp
-streettalk      566/udp
+streettalk	566/udp
 banyan-rpc	567/tcp
 banyan-rpc	567/udp
 ms-shuttle	568/tcp	   #Microsoft shuttle
@@ -1099,16 +1099,16 @@ acp		599/tcp	   #Aeolon Core Protocol
 acp		599/udp	   #Aeolon Core Protocol
 ipcserver	600/tcp	   #Sun IPC server
 ipcserver	600/udp	   #Sun IPC server
-syslog-conn     601/tcp    #Reliable Syslog Service
-syslog-conn     601/udp    #Reliable Syslog Service
-xmlrpc-beep     602/tcp    #XML-RPC over BEEP
-xmlrpc-beep     602/udp    #XML-RPC over BEEP
-idxp            603/tcp
-idxp            603/udp
-tunnel          604/tcp
-tunnel          604/udp
-soap-beep       605/tcp    #SOAP over BEEP
-soap-beep       605/udp    #SOAP over BEEP
+syslog-conn	601/tcp    #Reliable Syslog Service
+syslog-conn	601/udp    #Reliable Syslog Service
+xmlrpc-beep	602/tcp    #XML-RPC over BEEP
+xmlrpc-beep	602/udp    #XML-RPC over BEEP
+idxp		603/tcp
+idxp		603/udp
+tunnel		604/tcp
+tunnel		604/udp
+soap-beep	605/tcp    #SOAP over BEEP
+soap-beep	605/udp    #SOAP over BEEP
 urm		606/tcp	   #Cray Unified Resource Manager
 urm		606/udp	   #Cray Unified Resource Manager
 nqs		607/tcp
@@ -1137,14 +1137,14 @@ dei-icda	618/tcp
 dei-icda	618/udp
 compaq-evm	619/tcp    #Compaq EVM
 compaq-evm	619/udp    #Compaq EVM
-sco-websrvrmgr  620/tcp    #SCO WebServer Manager
-sco-websrvrmgr  620/udp    #SCO WebServer Manager
+sco-websrvrmgr	620/tcp    #SCO WebServer Manager
+sco-websrvrmgr	620/udp    #SCO WebServer Manager
 escp-ip		621/tcp    #ESCP
 escp-ip		621/udp    #ESCP
 collaborator	622/tcp
 collaborator	622/udp
-asf-rmcp        623/tcp    #ASF Remote Management and Control Protocol
-asf-rmcp        623/udp    #ASF Remote Management and Control Protocol
+asf-rmcp	623/tcp    #ASF Remote Management and Control Protocol
+asf-rmcp	623/udp    #ASF Remote Management and Control Protocol
 cryptoadmin	624/tcp    #Crypto Admin
 cryptoadmin	624/udp    #Crypto Admin
 dec_dlm		625/tcp    #DEC DLM
@@ -1167,12 +1167,12 @@ servstat	633/tcp    #Service Status update (Sterling Software)
 servstat	633/udp    #Service Status update (Sterling Software)
 ginad		634/tcp
 ginad		634/udp
-rlzdbase        635/tcp    #RLZ DBase
-rlzdbase        635/udp    #RLZ DBase
+rlzdbase	635/tcp    #RLZ DBase
+rlzdbase	635/udp    #RLZ DBase
 ldaps		636/tcp	   sldap	#ldap protocol over TLS/SSL
 ldaps		636/udp	   sldap
-lanserver       637/tcp
-lanserver       637/udp
+lanserver	637/tcp
+lanserver	637/udp
 mcns-sec	638/tcp
 mcns-sec	638/udp
 msdp		639/tcp
@@ -1191,12 +1191,12 @@ pssc		645/tcp
 pssc		645/udp
 ldp		646/tcp
 ldp		646/udp
-dhcp-failover   647/tcp    #DHCP Failover
-dhcp-failover   647/udp    #DHCP Failover
-rrp             648/tcp    #Registry Registrar Protocol (RRP)
-rrp             648/udp    #Registry Registrar Protocol (RRP)
-cadview-3d      649/tcp    #Cadview-3d - streaming 3d models over the internet
-cadview-3d      649/udp    #Cadview-3d - streaming 3d models over the internet
+dhcp-failover	647/tcp    #DHCP Failover
+dhcp-failover	647/udp    #DHCP Failover
+rrp		648/tcp    #Registry Registrar Protocol (RRP)
+rrp		648/udp    #Registry Registrar Protocol (RRP)
+cadview-3d	649/tcp    #Cadview-3d - streaming 3d models over the internet
+cadview-3d	649/udp    #Cadview-3d - streaming 3d models over the internet
 obex		650/tcp
 obex		650/udp
 ieee-mms	651/tcp    #IEEE MMS
@@ -1215,38 +1215,38 @@ rmc		657/tcp
 rmc		657/udp
 tenfold		658/tcp
 tenfold		658/udp
-mac-srvr-admin  660/tcp    #MacOS Server Admin
-mac-srvr-admin  660/udp    #MacOS Server Admin
-hap             661/tcp
-hap             661/udp
-pftp            662/tcp
-pftp            662/udp
-purenoise       663/tcp    #PureNoise
-purenoise       663/udp    #PureNoise
-asf-secure-rmcp 664/tcp    #ASF Secure Remote Management and Control Protocol
-asf-secure-rmcp 664/udp    #ASF Secure Remote Management and Control Protocol
-sun-dr          665/tcp    #Sun DR
-sun-dr          665/udp    #Sun DR
+mac-srvr-admin	660/tcp    #MacOS Server Admin
+mac-srvr-admin	660/udp    #MacOS Server Admin
+hap		661/tcp
+hap		661/udp
+pftp		662/tcp
+pftp		662/udp
+purenoise	663/tcp    #PureNoise
+purenoise	663/udp    #PureNoise
+asf-secure-rmcp	664/tcp    #ASF Secure Remote Management and Control Protocol
+asf-secure-rmcp	664/udp    #ASF Secure Remote Management and Control Protocol
+sun-dr		665/tcp    #Sun DR
+sun-dr		665/udp    #Sun DR
 mdqs		666/tcp
 mdqs		666/udp
 #PROBLEMS!===============================================
 doom		666/tcp	   #doom Id Software
 doom		666/udp	   #doom Id Software
 #PROBLEMS!===============================================
-disclose        667/tcp    #campaign contribution disclosures - SDR Technologies
-disclose        667/udp    #campaign contribution disclosures - SDR Technologies
-mecomm          668/tcp
-mecomm          668/udp
-meregister      669/tcp
-meregister      669/udp
-vacdsm-sws      670/tcp
-vacdsm-sws      670/udp
-vacdsm-app      671/tcp
-vacdsm-app      671/udp
-vpps-qua        672/tcp
-vpps-qua        672/udp
-cimplex         673/tcp
-cimplex         673/udp
+disclose	667/tcp    #campaign contribution disclosures - SDR Technologies
+disclose	667/udp    #campaign contribution disclosures - SDR Technologies
+mecomm		668/tcp
+mecomm		668/udp
+meregister	669/tcp
+meregister	669/udp
+vacdsm-sws	670/tcp
+vacdsm-sws	670/udp
+vacdsm-app	671/tcp
+vacdsm-app	671/udp
+vpps-qua	672/tcp
+vpps-qua	672/udp
+cimplex		673/tcp
+cimplex		673/udp
 acap		674/tcp	   #Application Configuration Access Protocol
 acap		674/udp	   #Application Configuration Access Protocol
 dctp		675/tcp
@@ -1257,70 +1257,70 @@ vpp		677/tcp    #Virtual Presence Protocol
 vpp		677/udp    #Virtual Presence Protocol
 ggf-ncp		678/tcp    #GNU Generation Foundation NCP
 ggf-ncp		678/udp    #GNU Generation Foundation NCP
-mrm             679/tcp
-mrm             679/udp
+mrm		679/tcp
+mrm		679/udp
 entrust-aaas	680/tcp
 entrust-aaas	680/udp
 entrust-aams	681/tcp
 entrust-aams	681/udp
-xfr             682/tcp
-xfr             682/udp
-corba-iiop      683/tcp    #CORBA IIOP
-corba-iiop      683/udp    #CORBA IIOP
+xfr		682/tcp
+xfr		682/udp
+corba-iiop	683/tcp    #CORBA IIOP
+corba-iiop	683/udp    #CORBA IIOP
 corba-iiop-ssl	684/tcp    #CORBA IIOP SSL
 corba-iiop-ssl	684/udp    #CORBA IIOP SSL
 mdc-portmapper	685/tcp    #MDC Port Mapper
 mdc-portmapper	685/udp    #MDC Port Mapper
-hcp-wismar      686/tcp    #Hardware Control Protocol Wismar
-hcp-wismar      686/udp    #Hardware Control Protocol Wismar
+hcp-wismar	686/tcp    #Hardware Control Protocol Wismar
+hcp-wismar	686/udp    #Hardware Control Protocol Wismar
 asipregistry	687/tcp
 asipregistry	687/udp
-realm-rusd      688/tcp    #ApplianceWare management protocol
-realm-rusd      688/udp    #ApplianceWare management protocol
-nmap            689/tcp
-nmap            689/udp
-vatp            690/tcp    #Velazquez Application Transfer Protocol
-vatp            690/udp    #Velazquez Application Transfer Protocol
+realm-rusd	688/tcp    #ApplianceWare management protocol
+realm-rusd	688/udp    #ApplianceWare management protocol
+nmap		689/tcp
+nmap		689/udp
+vatp		690/tcp    #Velazquez Application Transfer Protocol
+vatp		690/udp    #Velazquez Application Transfer Protocol
 msexch-routing	691/tcp    #MS Exchange Routing
 msexch-routing	691/udp    #MS Exchange Routing
 hyperwave-isp	692/tcp    #Hyperwave-ISP
 hyperwave-isp	692/udp    #Hyperwave-ISP
-connendp        693/tcp
-connendp        693/udp
-ha-cluster      694/tcp
-ha-cluster      694/udp
-ieee-mms-ssl    695/tcp
-ieee-mms-ssl    695/udp
-rushd           696/tcp
-rushd           696/udp
-uuidgen         697/tcp
-uuidgen         697/udp
-olsr            698/tcp
-olsr            698/udp
-accessnetwork   699/tcp    #Access Network
-accessnetwork   699/udp    #Access Network
-epp             700/tcp    #Extensible Provisioning Protocol
-epp             700/udp    #Extensible Provisioning Protocol
-lmp             701/tcp    #Link Management Protocol (LMP)
-lmp             701/udp    #Link Management Protocol (LMP)
-iris-beep       702/tcp    #IRIS over BEEP
-iris-beep       702/udp    #IRIS over BEEP
+connendp	693/tcp
+connendp	693/udp
+ha-cluster	694/tcp
+ha-cluster	694/udp
+ieee-mms-ssl	695/tcp
+ieee-mms-ssl	695/udp
+rushd		696/tcp
+rushd		696/udp
+uuidgen		697/tcp
+uuidgen		697/udp
+olsr		698/tcp
+olsr		698/udp
+accessnetwork	699/tcp    #Access Network
+accessnetwork	699/udp    #Access Network
+epp		700/tcp    #Extensible Provisioning Protocol
+epp		700/udp    #Extensible Provisioning Protocol
+lmp		701/tcp    #Link Management Protocol (LMP)
+lmp		701/udp    #Link Management Protocol (LMP)
+iris-beep	702/tcp    #IRIS over BEEP
+iris-beep	702/udp    #IRIS over BEEP
 elcsd		704/tcp	   #errlog copy/server daemon
 elcsd		704/udp	   #errlog copy/server daemon
-agentx	        705/tcp    #AgentX
-agentx          705/udp    #AgentX
-silc            706/tcp
-silc            706/udp
-borland-dsj     707/tcp    #Borland DSJ
-borland-dsj     707/udp	   #Borland DSJ
+agentx		705/tcp    #AgentX
+agentx		705/udp    #AgentX
+silc		706/tcp
+silc		706/udp
+borland-dsj	707/tcp    #Borland DSJ
+borland-dsj	707/udp	   #Borland DSJ
 entrustmanager	709/tcp	   #EntrustManager
 entrustmanager	709/udp	   #EntrustManager
-entrust-ash     710/tcp    #Entrust Administration Service Handler
-entrust-ash     710/udp    #Entrust Administration Service Handler
-cisco-tdp       711/tcp    #Cisco TDP
-cisco-tdp       711/udp    #Cisco TDP
-tbrpf           712/tcp
-tbrpf           712/udp
+entrust-ash	710/tcp    #Entrust Administration Service Handler
+entrust-ash	710/udp    #Entrust Administration Service Handler
+cisco-tdp	711/tcp    #Cisco TDP
+cisco-tdp	711/udp    #Cisco TDP
+tbrpf		712/tcp
+tbrpf		712/udp
 iris-xpc	713/tcp    #IRIS over XPC
 iris-xpc	713/udp    #IRIS over XPC
 iris-xpcs	714/tcp    #IRIS over XPCS
@@ -1419,49 +1419,49 @@ fcp-udp		810/udp    #FCP Datagram
 itm-mcell-s	828/tcp
 itm-mcell-s	828/udp
 pkix-3-ca-ra	829/tcp    #PKIX-3 CA/RA
-pkix-3-ca-ra    829/udp    #PKIX-3 CA/RA
-netconf-ssh     830/tcp    #NETCONF over SSH
-netconf-ssh     830/udp    #NETCONF over SSH
-netconf-beep    831/tcp    #NETCONF over BEEP
-netconf-beep    831/udp    #NETCONF over BEEP
-netconfsoaphttp 832/tcp    #NETCONF for SOAP over HTTPS
-netconfsoaphttp 832/udp    #NETCONF for SOAP over HTTPS
-netconfsoapbeep 833/tcp    #NETCONF for SOAP over BEEP
-netconfsoapbeep 833/udp    #NETCONF for SOAP over BEEP
-dhcp-failover2  847/tcp    #dhcp-failover 2
-dhcp-failover2  847/udp    #dhcp-failover 2
-gdoi            848/tcp
-gdoi            848/udp
-iscsi           860/tcp
-iscsi           860/udp
-owamp-control   861/tcp
-owamp-control   861/udp
+pkix-3-ca-ra	829/udp    #PKIX-3 CA/RA
+netconf-ssh	830/tcp    #NETCONF over SSH
+netconf-ssh	830/udp    #NETCONF over SSH
+netconf-beep	831/tcp    #NETCONF over BEEP
+netconf-beep	831/udp    #NETCONF over BEEP
+netconfsoaphttp	832/tcp    #NETCONF for SOAP over HTTPS
+netconfsoaphttp	832/udp    #NETCONF for SOAP over HTTPS
+netconfsoapbeep	833/tcp    #NETCONF for SOAP over BEEP
+netconfsoapbeep	833/udp    #NETCONF for SOAP over BEEP
+dhcp-failover2	847/tcp    #dhcp-failover 2
+dhcp-failover2	847/udp    #dhcp-failover 2
+gdoi		848/tcp
+gdoi		848/udp
+iscsi		860/tcp
+iscsi		860/udp
+owamp-control	861/tcp
+owamp-control	861/udp
 supfilesrv	871/tcp	   # for SUP
 rsync		873/tcp
 rsync		873/udp
-iclcnet-locate  886/tcp    #ICL coNETion locate server
-iclcnet-locate  886/udp    #ICL coNETion locate server
-iclcnet_svinfo  887/tcp    #ICL coNETion server info
-iclcnet_svinfo  887/udp    #ICL coNETion server info
+iclcnet-locate	886/tcp    #ICL coNETion locate server
+iclcnet-locate	886/udp    #ICL coNETion locate server
+iclcnet_svinfo	887/tcp    #ICL coNETion server info
+iclcnet_svinfo	887/udp    #ICL coNETion server info
 accessbuilder	888/tcp
 accessbuilder	888/udp
-omginitialrefs  900/tcp    #OMG Initial Refs
-omginitialrefs  900/udp    #OMG Initial Refs
+omginitialrefs	900/tcp    #OMG Initial Refs
+omginitialrefs	900/udp    #OMG Initial Refs
 swat		901/tcp	   # samba web configuration tool
-smpnameres      901/tcp
-smpnameres      901/udp
-ideafarm-chat   902/tcp
-ideafarm-chat   902/udp
-ideafarm-catch  903/tcp
-ideafarm-catch  903/udp
-kink            910/tcp    #Kerberized Internet Negotiation of Keys (KINK)
-kink            910/udp    #Kerberized Internet Negotiation of Keys (KINK)
-xact-backup     911/tcp
-xact-backup     911/udp
-apex-mesh       912/tcp    #APEX relay-relay service
-apex-mesh       912/udp    #APEX relay-relay service
-apex-edge       913/tcp    #APEX endpoint-relay service
-apex-edge       913/udp    #APEX endpoint-relay service
+smpnameres	901/tcp
+smpnameres	901/udp
+ideafarm-chat	902/tcp
+ideafarm-chat	902/udp
+ideafarm-catch	903/tcp
+ideafarm-catch	903/udp
+kink		910/tcp    #Kerberized Internet Negotiation of Keys (KINK)
+kink		910/udp    #Kerberized Internet Negotiation of Keys (KINK)
+xact-backup	911/tcp
+xact-backup	911/udp
+apex-mesh	912/tcp    #APEX relay-relay service
+apex-mesh	912/udp    #APEX relay-relay service
+apex-edge	913/tcp    #APEX endpoint-relay service
+apex-edge	913/udp    #APEX endpoint-relay service
 rndc		953/tcp	   # named's rndc control socket
 ftps-data	989/tcp	   # ftp protocol, data, over TLS/SSL
 ftps-data	989/udp
@@ -1491,10 +1491,10 @@ cadlock2	1000/tcp
 cadlock2	1000/udp
 surf		1010/tcp
 surf		1010/udp
-exp1            1021/tcp   #RFC3692-style Experiment 1 (*)    [RFC4727]
-exp1            1021/udp   #RFC3692-style Experiment 1 (*)    [RFC4727]
-exp2            1022/tcp   #RFC3692-style Experiment 2 (*)    [RFC4727]
-exp2            1022/udp   #RFC3692-style Experiment 2 (*)    [RFC4727]
+exp1		1021/tcp   #RFC3692-style Experiment 1 (*)    [RFC4727]
+exp1		1021/udp   #RFC3692-style Experiment 1 (*)    [RFC4727]
+exp2		1022/tcp   #RFC3692-style Experiment 2 (*)    [RFC4727]
+exp2		1022/udp   #RFC3692-style Experiment 2 (*)    [RFC4727]
 #
 # REGISTERED PORT NUMBERS
 #
@@ -2401,6 +2401,7 @@ xdsxdm		6558/udp
 sane-port	6566/tcp   #Scanner Access Now Easy (SANE) Control Port
 sane-port	6566/udp   #Scanner Access Now Easy (SANE) Control Port
 ircd		6667/tcp   #Internet Relay Chat (unofficial)
+ircs-u		6697/tcp   #Internet Relay Chat over TLS/SSL
 frc-hp		6704/sctp  #ForCES HP (High Priority) channel
 frc-mp		6705/sctp  #ForCES MP (Medium Priority) channel
 frc-lp		6706/sctp  #ForCES LP (Low priority) channel