diff --git a/Makefile.inc1 b/Makefile.inc1
index 1c6582d9d76..fb0ae5e5daa 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1914,18 +1914,6 @@ _dtc= usr.bin/dtc
 _dtc= gnu/usr.bin/dtc
 .endif
 
-.if ${MK_KERBEROS} != "no"
-_kerberos5_bootstrap_tools= \
-	kerberos5/tools/make-roken \
-	kerberos5/lib/libroken \
-	kerberos5/lib/libvers \
-	kerberos5/tools/asn1_compile \
-	kerberos5/tools/slc \
-	usr.bin/compile_et
-
-.ORDER: ${_kerberos5_bootstrap_tools:C/^/${_bt}-/g}
-.endif
-
 # r283777 makewhatis(1) replaced with mandoc version which builds a database.
 _libopenbsd?=	lib/libopenbsd
 _makewhatis=	usr.bin/mandoc
@@ -1938,7 +1926,6 @@ bootstrap-tools: .PHONY
 #	FreeBSD versions that need the tool built at this stage of the build.
 .for _tool in \
     ${_clang_tblgen} \
-    ${_kerberos5_bootstrap_tools} \
     ${_strfile} \
     ${_gperf} \
     ${_dtc} \
diff --git a/UPDATING b/UPDATING
index 69f9c7cbfd1..02384ebb6af 100644
--- a/UPDATING
+++ b/UPDATING
@@ -51,6 +51,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
++20160714:
+	When building multiple kernels using KERNCONF, non-existent KERNCONF
+	files will produce an error and buildkernel will fail. Previously
+	missing KERNCONF files silently failed giving no indication as to
+	why, only to subsequently discover during installkernel that the
+	desired kernel was never built in the first place.
+
 20170912:
 	The default serial number format for CTL LUNs has changed.  This will
 	affect users who use /dev/diskid/* device nodes, or whose FibreChannel