diff --git a/UPDATING b/UPDATING
index ad30ed2b3506..c65431ce29f1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -51,6 +51,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 
 ****************************** SPECIAL WARNING: ******************************
 
+20180110:
+	LLVM's lld linker is now used as the FreeBSD/amd64 bootstrap linker.
+	This means it is used to link the kernel and userland libraries and
+	executables, but is not yet installed as /usr/bin/ld by default.
+
+	To revert to ld.bfd as the bootstrap linker, in /etc/src.conf set
+        WITHOUT_LLD_BOOTSTRAP=yes
+
 20180110:
 	On i386, pmtimer has been removed. It's functionality has been folded
 	into apm. It was a nop on ACPI in current for a while now (but was still