diff --git a/doc/tools/Makefile.am b/doc/tools/Makefile.am
index 9ecb1bb4..2c095321 100644
--- a/doc/tools/Makefile.am
+++ b/doc/tools/Makefile.am
@@ -32,6 +32,9 @@ tools.html: $(srcdir)/tools.xml $(wildcard $(srcdir)/*.1.xml)
 		| sed "s,FILEOPTS,\
 			$(shell sed -n 's,.*<option>\([^<]*\)</option>.*<replaceable>.*filename.*,\1,pg' $< \
 				| sort -u | grep -- '^\-' | tr '\n' '|' | sed 's,|$$,,' | grep ^ || echo "!*"),"  \
+		| sed "s,PINOPTS,\
+			$(shell sed -En 's,.*<option>([^<]*)</option>.*<replaceable>\s*(newpin|pin|puk|sopin|sopuk)\s*<.*,\1,pg' $< \
+				| sort -u | grep -- '^\-' | tr '\n' '|' | sed 's,|$$,,' | grep ^ || echo "!*"),"  \
 		| sed "s,MODULEOPTS,\
 			$(shell sed -n 's,.*<option>\([^<]*\)</option>.*<replaceable>.*mod.*,\1,pg' $< \
 				| sort -u | grep -- '^\-' | tr '\n' '|' | sed 's,|$$,,' | grep ^ || echo "!*")," \
diff --git a/doc/tools/completion-template b/doc/tools/completion-template
index 94e40c2c..895a3a9c 100644
--- a/doc/tools/completion-template
+++ b/doc/tools/completion-template
@@ -3,7 +3,7 @@ _FUNCTION_NAME()
 {
     COMPREPLY=()
     local cur prev split=false
-    _get_comp_words_by_ref cur prev
+    _get_comp_words_by_ref -n : cur prev
 
     _split_longopt && split=true
 
@@ -23,6 +23,11 @@ _FUNCTION_NAME()
             _filedir
             return 0
             ;;
+        PINOPTS|--password)
+            COMPREPLY=( $( compgen -W "$(printenv | cut -d = -f 1 | xargs printf 'env:%s ')" -- $cur ) )
+            __ltrim_colon_completions "$cur"
+            return 0
+            ;;
         OPTSWITHARGS)
             return 0
             ;;