Index: Makefile
===================================================================
--- Makefile	(revision 324609)
+++ Makefile	(working copy)
@@ -3,21 +3,18 @@
 #
 # The user-driven targets are:
 #
-# universe            - *Really* build *everything* (buildworld and
-#                       all kernels on all architectures).
-# 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.
+# universe            - *Really* build *everything* (buildworld and all kernels on all architectures).
+# 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".
-# world               - buildworld + installworld, no kernel.
+# world               - Combine buildworld + installworld, no kernel.
 # buildkernel         - Rebuild the kernel and the kernel-modules.
 # installkernel       - Install the kernel and the kernel-modules.
-# installkernel.debug
+# installkernel.debug - Install the kernel and the kernel-modules with debug symbols.
 # reinstallkernel     - Reinstall the kernel and the kernel-modules.
-# reinstallkernel.debug
-# kernel              - buildkernel + installkernel.
-# kernel-toolchain    - Builds the subset of world necessary to build a kernel
+# reinstallkernel.debug - Reinstall the kernel and the kernel-moduesl with debug symbols.
+# kernel              - Combine buildkernel + installkernel.
+# kernel-toolchain    - Builds the subset of world necessary to build a kernel.
 # kernel-toolchains   - Build kernel-toolchain for all universe targets.
 # doxygen             - Build API documentation of the kernel, needs doxygen.
 # update              - Convenient way to update your source tree(s).
@@ -30,16 +27,14 @@
 # delete-old-dirs     - Delete obsolete directories.
 # delete-old-files    - Delete obsolete files.
 # delete-old-libs     - Delete obsolete libraries.
-# targets             - Print a list of supported TARGET/TARGET_ARCH pairs
-#                       for world and kernel targets.
+# targets             - Print a list of supported TARGET/TARGET_ARCH pairs for world and kernel targets.
 # toolchains          - Build a toolchain for all world and kernel targets.
-# xdev                - xdev-build + xdev-install for the architecture
-#                       specified with XDEV and XDEV_ARCH.
+# xdev                - Combine xdev-build + xdev-install for the architecture specified with XDEV and XDEV_ARCH.
 # xdev-build          - Build cross-development tools.
 # xdev-install        - Install cross-development tools.
-# xdev-links          - Create traditional links in /usr/bin for cc, etc
-# native-xtools       - Create host binaries that produce target objects
-#                       for use in qemu user-mode jails.
+# xdev-links          - Create traditional links in /usr/bin for cc, etc.
+# native-xtools       - Create host binaries that produce target objects for use in qemu user-mode jails.
+# help                - List available targets.
 # 
 # "quick" way to test all kernel builds:
 # 	_jflag=`sysctl -n hw.ncpu`
@@ -290,6 +285,11 @@
 buildworld: upgrade_checks
 .endif
 
+help:
+	@grep -E '^# [a-z].*- [A-Z*].*' "${.CURDIR}/Makefile" | sed 's,^# ,,'
+	@echo
+	@echo "For more details see build(7)."
+
 #
 # Handle the user-driven targets, using the source relative mk files.
 #
Index: share/man/man7/build.7
===================================================================
--- share/man/man7/build.7	(revision 324609)
+++ share/man/man7/build.7	(working copy)
@@ -260,6 +260,8 @@
 including
 .Pa LINT .
 This command takes a long time.
+.It Cm help
+Print a list of available targets with description.
 .It Cm update
 Get updated sources as configured in
 .Xr make.conf 5 .