Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -718,9 +718,10 @@
 		! -name DEFAULTS ! -name NOTES | \
 		${_THINNER}
 universe_kernconfs: universe_kernels_prologue .PHONY
+BSOBJTOP!=	cd ${SRCTOP} && env ${_MAKE} -V BSOBJTOP
 .for kernel in ${KERNCONFS}
 TARGET_ARCH_${kernel}!=	cd ${KERNSRCDIR}/${TARGET}/conf && \
-	config -m ${KERNSRCDIR}/${TARGET}/conf/${kernel} 2> /dev/null | \
+	${BSOBJTOP}/usr.sbin/config/config -m ${KERNSRCDIR}/${TARGET}/conf/${kernel} 2> /dev/null | \
 	grep -v WARNING: | cut -f 2
 .if empty(TARGET_ARCH_${kernel})
 .error "Target architecture for ${TARGET}/conf/${kernel} unknown.  config(8) likely too old."
Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -696,8 +696,9 @@
 		WORLDTMP=${WORLDTMP} \
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
 # need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
+BSOBJTOP=	${WORLDTMP}/obj-tools
 BSARGS= 	DESTDIR= \
-		OBJTOP='${WORLDTMP}/obj-tools' \
+		OBJTOP='${BSOBJTOP}' \
 		OBJROOT='$${OBJTOP}/' \
 		MAKEOBJDIRPREFIX= \
 		BOOTSTRAPPING=${BOOTSTRAPPING_OSRELDATE} \
Index: stand/libsa/nfs.c
===================================================================
--- stand/libsa/nfs.c
+++ stand/libsa/nfs.c
@@ -486,7 +486,8 @@
 
 #ifdef NFS_DEBUG
  	if (debug)
- 	    printf("nfs_open: %s (rootpath=%s)\n", upath, rootpath);
+		printf("nfs_open: %s (rootip=%s rootpath=%s)\n", upath,
+		    inet_ntoa(rootip), rootpath);
 #endif
 	if (!rootpath[0]) {
 		printf("no rootpath, no nfs\n");
@@ -691,14 +692,14 @@
 		if (cc == -1) {
 #ifdef NFS_DEBUG
 			if (debug)
-				printf("nfs_read: read: %s", strerror(errno));
+				printf("nfs_read: read: %s\n", strerror(errno));
 #endif
 			return (errno);	/* XXX - from nfs_readdata */
 		}
 		if (cc == 0) {
 #ifdef NFS_DEBUG
 			if (debug)
-				printf("nfs_read: hit EOF unexpectantly");
+				printf("nfs_read: hit EOF unexpectedly\n");
 #endif
 			goto ret;
 		}
Index: sys/dev/aac/aac_pci.c
===================================================================
--- sys/dev/aac/aac_pci.c
+++ sys/dev/aac/aac_pci.c
@@ -494,7 +494,7 @@
 
 static devclass_t	aacch_devclass;
 DRIVER_MODULE(aacch, pci, aacch_driver, aacch_devclass, NULL, NULL);
-MODULE_PNP_INFO("U16:vendor;U16:device;", pci, aacch,
+MODULE_PNP_INFO("U16:vendor;U16:device;U16:subvendor;U16:subdevice", pci, aacch,
     aac_identifiers, nitems(aac_identifiers) - 1);
 
 static int
Index: sys/dev/imcsmb/imcsmb_pci.c
===================================================================
--- sys/dev/imcsmb/imcsmb_pci.c
+++ sys/dev/imcsmb/imcsmb_pci.c
@@ -340,5 +340,7 @@
 DRIVER_MODULE(imcsmb_pci, pci, imcsmb_pci_driver, imcsmb_pci_devclass, 0, 0);
 MODULE_DEPEND(imcsmb_pci, pci, 1, 1, 1);
 MODULE_VERSION(imcsmb_pci, 1);
+MODULE_PNP_INFO("U16:device;D:#;T:vendor=0x8086", pci, imcsmb_pci_driver,
+    imcsmb_pci_devices, nitems(imcsmb_pci_devices) - 1);
 
 /* vi: set ts=8 sw=4 sts=8 noet: */
Index: sys/kern/ksched.c
===================================================================
--- sys/kern/ksched.c
+++ sys/kern/ksched.c
@@ -186,7 +186,7 @@
 			    RTP_PRIO_REALTIME;
 			rtp_to_pri(&rtp, td);
 		} else {
-			e = EPERM;
+			e = EINVAL;
 		}
 		break;
 	case SCHED_OTHER:
Index: targets/pseudo/bootstrap-tools/Makefile
===================================================================
--- targets/pseudo/bootstrap-tools/Makefile
+++ targets/pseudo/bootstrap-tools/Makefile
@@ -33,8 +33,9 @@
 .endif
 
 # need to keep this in sync with src/Makefile.inc1 
+BSOBJTOP=	${WORLDTMP}/obj-tools
 BSARGS= 	DESTDIR= \
-		OBJTOP='${WORLDTMP}/obj-tools' \
+		OBJTOP='${BSOBJTOP}' \
 		OBJROOT='$${OBJTOP}/' \
 		MAKEOBJDIRPREFIX= \
 		BOOTSTRAPPING=${OSRELDATE} \
Index: tools/build/beinstall.sh
===================================================================
--- tools/build/beinstall.sh
+++ tools/build/beinstall.sh
@@ -238,6 +238,7 @@
 
 BE_PKG="chroot ${BE_MNTPT} env ASSUME_ALWAYS_YES=true pkg"
 if [ -z "${NO_PKG_UPGRADE}" ]; then
+${BE_PKG}-static install -f pkg || errx "Unable to run pkg-static"
 	${BE_PKG} update || errx "Unable to update pkg"
 	${BE_PKG} upgrade || errx "Unable to upgrade pkgs"
 fi