diff --git a/Makefile b/Makefile
index f05ab46e1eee..5180fc03c826 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@
 #
 # universe            - *Really* build *everything* (buildworld and
 #                       all kernels on all architectures).
-# tinderbox           - Same as universe, but stop on first failure.
+# tinderbox           - Same as universe, but presents a list of failed build
+#                       targets and exits with an error if there were any.
 # buildworld          - Rebuild *everything*, including glue to help do
 #                       upgrades.
 # installworld        - Install everything built by "buildworld".
diff --git a/share/man/man7/build.7 b/share/man/man7/build.7
index 0df2b817407f..c145e2de6c89 100644
--- a/share/man/man7/build.7
+++ b/share/man/man7/build.7
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 02, 2010
+.Dd January 22, 2011
 .Dt BUILD 7
 .Os
 .Sh NAME
@@ -229,6 +229,11 @@ This command takes a long time.
 .It Cm update
 Get updated sources as configured in
 .Xr make.conf 5 .
+.It Cm tinderbox
+Execute the same targets as
+.Cm universe .
+In addition print a summary of all failed targets at the end and
+exit with an error if there were any.
 .El
 .Pp
 Kernel specific build targets in