diff --git a/Makefile.inc1 b/Makefile.inc1
index a13438225960..8fc07557dbf1 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1125,7 +1125,9 @@ distrib-dirs: .MAKE .PHONY
 	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
 	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 
-distribution: distrib-dirs .MAKE .PHONY
+distribution: .MAKE .PHONY
+	${_+_}cd ${.CURDIR}/etc; ${CROSSENV} PATH=${TMPPATH} ${MAKE} \
+	    ${IMAKE_INSTALL} ${IMAKE_MTREE} METALOG=${METALOG} ${.TARGET}
 	${_+_}cd ${.CURDIR}; ${CROSSENV} PATH=${TMPPATH} \
 		${MAKE} -f Makefile.inc1 ${IMAKE_INSTALL} \
 		METALOG=${METALOG} installconfig
diff --git a/lib/libc/nls/msgcat.c b/lib/libc/nls/msgcat.c
index 0cba460403b3..3df76b60b4bd 100644
--- a/lib/libc/nls/msgcat.c
+++ b/lib/libc/nls/msgcat.c
@@ -325,6 +325,21 @@ notfound:
 	return ((char *)s);
 }
 
+static void
+catfree(struct catentry *np)
+{
+
+	if (np->catd != NULL && np->catd != NLERR) {
+		munmap(np->catd->__data, (size_t)np->catd->__size);
+		free(np->catd);
+	}
+	SLIST_REMOVE(&cache, np, catentry, list);
+	free(np->name);
+	free(np->path);
+	free(np->lang);
+	free(np);
+}
+
 int
 catclose(nl_catd catd)
 {
@@ -341,15 +356,8 @@ catclose(nl_catd catd)
 	SLIST_FOREACH(np, &cache, list) {
 		if (catd == np->catd) {
 			np->refcount--;
-			if (np->refcount == 0) {
-				munmap(catd->__data, (size_t)catd->__size);
-				free(catd);
-				SLIST_REMOVE(&cache, np, catentry, list);
-				free(np->name);
-				free(np->path);
-				free(np->lang);
-				free(np);
-			}
+			if (np->refcount == 0)
+				catfree(np);
 			break;
 		}
 	}
diff --git a/lib/libdevctl/devctl.3 b/lib/libdevctl/devctl.3
index be869f9d9868..b2734cf4aa30 100644
--- a/lib/libdevctl/devctl.3
+++ b/lib/libdevctl/devctl.3
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 26, 2014
+.Dd February 2, 2016
 .Dt DEVCTL 3
 .Os
 .Sh NAME
@@ -35,6 +35,7 @@
 .Nm devctl_disable ,
 .Nm devctl_enable ,
 .Nm devctl_resume ,
+.Nm devctl_set_driver ,
 .Nm devctl_suspend
 .Nd device control library
 .Sh LIBRARY
@@ -52,9 +53,9 @@
 .Ft int
 .Fn devctl_resume "const char *device"
 .Ft int
-.Fn devctl_suspend "const char *device"
-.Ft int
 .Fn devctl_set_driver "const char *device" "const char *driver" "bool force"
+.Ft int
+.Fn devctl_suspend "const char *device"
 .Sh DESCRIPTION
 The
 .Nm
@@ -287,7 +288,7 @@ The new device driver failed to attach.
 The
 .Nm
 library first appeared in
-.Fx 11.0 .
+.Fx 10.3 .
 .Sh BUGS
 If a device is suspended individually via
 .Fn devctl_suspend
diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c
index f9a1718635a0..7dfaa06ed966 100644
--- a/sys/powerpc/mpc85xx/lbc.c
+++ b/sys/powerpc/mpc85xx/lbc.c
@@ -113,7 +113,8 @@ static driver_t lbc_driver = {
 
 devclass_t lbc_devclass;
 
-DRIVER_MODULE(lbc, ofwbus, lbc_driver, lbc_devclass, 0, 0);
+EARLY_DRIVER_MODULE(lbc, ofwbus, lbc_driver, lbc_devclass,
+    0, 0, BUS_PASS_BUS);
 
 /*
  * Calculate address mask used by OR(n) registers. Use memory region size to
diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c
index d8238a1b58f1..4e56429ea0bb 100644
--- a/sys/powerpc/powerpc/exec_machdep.c
+++ b/sys/powerpc/powerpc/exec_machdep.c
@@ -219,10 +219,10 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
 	 */
 	if ((td->td_pflags & TDP_ALTSTACK) != 0 && !oonstack &&
 	    SIGISMEMBER(psp->ps_sigonstack, sig)) {
-		usfp = (void *)((uintptr_t)td->td_sigstk.ss_sp +
-		   td->td_sigstk.ss_size - rndfsize);
+		usfp = (void *)(((uintptr_t)td->td_sigstk.ss_sp +
+		   td->td_sigstk.ss_size - rndfsize) & ~0xFul);
 	} else {
-		usfp = (void *)(tf->fixreg[1] - rndfsize);
+		usfp = (void *)((tf->fixreg[1] - rndfsize) & ~0xFul);
 	}
 
 	/*
diff --git a/sys/powerpc/powerpc/sigcode32.S b/sys/powerpc/powerpc/sigcode32.S
index 023618215d32..cd4c3cf72f9e 100644
--- a/sys/powerpc/powerpc/sigcode32.S
+++ b/sys/powerpc/powerpc/sigcode32.S
@@ -45,9 +45,9 @@
  */
 	.globl	CNAME(sigcode32),CNAME(szsigcode32)
 CNAME(sigcode32):
-	addi	1,1,-20			/* reserved space for callee */
+	addi	1,1,-32			/* reserved space for callee */
 	blrl
-	addi	3,1,20+SF_UC		/* restore sp, and get &frame->sf_uc */
+	addi	3,1,32+SF_UC		/* restore sp, and get &frame->sf_uc */
 	li	0,SYS_sigreturn
 	sc				/* sigreturn(scp) */
 	li	0,SYS_exit
diff --git a/usr.sbin/bsdconfig/share/strings.subr b/usr.sbin/bsdconfig/share/strings.subr
index 1a4fe6ef081c..f1dbbd76a5e6 100644
--- a/usr.sbin/bsdconfig/share/strings.subr
+++ b/usr.sbin/bsdconfig/share/strings.subr
@@ -154,20 +154,25 @@ f_substr()
 # Similar to sprintf(3), write a string into $var_to_set using printf(1) syntax
 # (`$format [$arguments ...]').
 #
-f_sprintf()
-{
-	local __var_to_set="$1"
-	shift 1 # var_to_set
-
-	case "$BASH_VERSION" in
-	3.1*|4.*)
-		local __tmp
+case "$BASH_VERSION" in
+3.1*|4.*)
+	f_sprintf()
+	{
+		local __var_to_set="$1" __tmp
+		shift 1 # var_to_set
 		printf -v __tmp "$@"
 		eval "$__var_to_set"=\"\${__tmp%\$NL}\"
-		;;
-	*) eval "$__var_to_set"=\$\( printf -- \"\$@\" \)
-	esac
-}
+	}
+	;;
+*)
+	# NB: On FreeBSD, sh(1) runs this faster than bash(1) runs the above
+	f_sprintf()
+	{
+		local __var_to_set="$1"
+		shift 1 # var_to_set
+		eval "$__var_to_set"=\$\( printf -- \"\$@\" \)
+	}
+esac
 
 # f_vsprintf $var_to_set $format $format_args
 #
diff --git a/usr.sbin/devctl/devctl.8 b/usr.sbin/devctl/devctl.8
index fef42be13073..2257cb63cc3d 100644
--- a/usr.sbin/devctl/devctl.8
+++ b/usr.sbin/devctl/devctl.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 5, 2015
+.Dd February 2, 2016
 .Dt DEVCTL 8
 .Os
 .Sh NAME
@@ -134,4 +134,4 @@ the device will not be changed.
 The
 .Nm
 utility first appeared in
-.Fx 11.0 .
+.Fx 10.3 .
diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc
index aa57f1beb7f2..1da537fd5992 100644
--- a/usr.sbin/sysrc/sysrc
+++ b/usr.sbin/sysrc/sysrc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #-
-# Copyright (c) 2010-2015 Devin Teske
+# Copyright (c) 2010-2016 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,7 +40,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 #
 # Version information
 #
-SYSRC_VERSION="7.0 Sep-13,2015"
+SYSRC_VERSION="7.1 Feb-2,2016"
 
 #
 # Options
@@ -595,7 +595,7 @@ fi
 if [ "$SHOW_ALL" ]; then
 	#
 	# Get a list of variables that are currently set in the rc.conf(5)
-	# files (included `/etc/defaults/rc.conf') by performing a call to
+	# files (including `/etc/defaults/rc.conf') by performing a call to
 	# source_rc_confs() in a clean environment.
 	#
 	( # Operate in a sub-shell to protect the parent environment
diff --git a/usr.sbin/sysrc/sysrc.8 b/usr.sbin/sysrc/sysrc.8
index 3996b1f9482c..075fc3bd8a1e 100644
--- a/usr.sbin/sysrc/sysrc.8
+++ b/usr.sbin/sysrc/sysrc.8
@@ -255,7 +255,7 @@ When using the
 .Ql key+=value
 syntax to add items to existing values,
 the first character of the value is taken as the delimiter separating items
-.Pq usually Qo (space) Qc or Qo , Qc .
+.Pq usually Qo " " Qc or Qo , Qc .
 For example, in the following statement:
 .Bl -item -offset indent
 .It
@@ -316,7 +316,7 @@ When using the
 .Ql key-=value
 syntax to remove items from existing values,
 the first character of the value is taken as the delimiter separating items
-.Pq usually Qo \  Qc or Qo , Qc .
+.Pq usually Qo " " Qc or Qo , Qc .
 For example, in the following statement:
 .Pp
 .Dl Nm cloned_interfaces-=" gif0"