diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst
index d58fbb32ea0..ac1e2a76811 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-execution.rst
@@ -592,6 +592,12 @@ compare the matched signatures to determine the stamps and delta
 where these two stamp trees diverge. This can be used to determine why
 tasks need to be re-run in situations where that is not expected.
 
+The third signature handler that can be passed is "lockedsigs" that will
+conveniently write the task signatures in a file called "locked-sigs.inc",
+that can be included in user's configuration to lock recipes or tasks.
+User can include the whole file or extract the signatures needed to lock
+only selected tasks or recipes.
+
 .. note::
 
    It is likely that future versions of BitBake will provide other
diff --git a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.rst b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.rst
index 35ffb88b026..127c662320b 100644
--- a/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.rst
+++ b/bitbake/doc/bitbake-user-manual/bitbake-user-manual-intro.rst
@@ -398,10 +398,15 @@ Following is the usage and syntax for BitBake::
      -S SIGNATURE_HANDLER, --dump-signatures=SIGNATURE_HANDLER
                            Dump out the signature construction information, with
                            no task execution. The SIGNATURE_HANDLER parameter is
-                           passed to the handler. Two common values are none and
-                           printdiff but the handler may define more/less. none
-                           means only dump the signature, printdiff means compare
-                           the dumped signature with the cached one.
+                           passed to the handler. Allowed values are none,
+                           printdiff and lockedsigs. none means only dump the
+                           signature, printdiff means recursively compare the
+                           dumped signature with the most recent one in a local
+                           build or sstate cache (can be used to find out why
+                           tasks re-run when that is not expected). lockedsigs
+                           means generate a locked-sigs.inc file containing the
+                           locked signature of all tasks needed to build the
+                           target.
      -p, --parse-only      Quit after parsing the BB recipes.
      -s, --show-versions   Show current and preferred versions of all recipes.
      -e, --environment     Show the global or per-recipe environment complete
diff --git a/bitbake/lib/bb/main.py b/bitbake/lib/bb/main.py
index bca8ebfa090..1f4313fa0dd 100755
--- a/bitbake/lib/bb/main.py
+++ b/bitbake/lib/bb/main.py
@@ -215,11 +215,13 @@ def create_bitbake_parser():
                         default=[], metavar="SIGNATURE_HANDLER",
                         help="Dump out the signature construction information, with no task "
                              "execution. The SIGNATURE_HANDLER parameter is passed to the "
-                             "handler. Two common values are none and printdiff but the handler "
-                             "may define more/less. none means only dump the signature, printdiff"
-                             " means recursively compare the dumped signature with the most recent"
-                             " one in a local build or sstate cache (can be used to find out why tasks re-run"
-                             " when that is not expected)")
+                             "handler. Allowed values are none, printdiff and lockedsigs. "
+                             "none means only dump the signature, printdiff means recursively "
+                             "compare the dumped signature with the most recent one in a local "
+                             "build or sstate cache (can be used to find out why tasks re-run "
+                             "when that is not expected). lockedsigs means generate a locked-sigs.inc "
+                             "file containing the locked signature of all tasks needed to build "
+                             "the target.")
 
     exec_group.add_argument("--revisions-changed", action="store_true",
                         help="Set the exit code depending on whether upstream floating "