diff --git a/completions/gpg b/completions/gpg
index da7eaaf0f72..054973cd625 100644
--- a/completions/gpg
+++ b/completions/gpg
@@ -6,20 +6,33 @@ _gpg()
     _comp_initialize -- "$@" || return
 
     case $prev in
-        --sign | --clearsign | --decrypt-files | --load-extension | -!(-*)s)
+        --sign | --clear-sign | --clearsign | --decrypt-files | \
+            --load-extension | -!(-*)s)
             _filedir
             return
             ;;
-        --export | --sign-key | --lsign-key | --nrsign-key | --nrlsign-key | --edit-key)
+        --list-keys | --list-public-keys | --locate-keys | \
+            --locate-external-keys | --fingerprint | --delete-keys | \
+            --delete-secret-and-public-keys | --export | --refresh-keys | \
+            --search-keys | --edit-key | --sign-key | --lsign-key | \
+            --nrsign-key | --nrlsign-key | --try-secret-key | -!(-*)k)
             # return list of public keys
-            COMPREPLY=($(compgen -W "$($1 --list-keys 2>/dev/null | command sed -ne \
-                's@^pub.*/\([^ ]*\).*$@\1@p' -ne \
-                's@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur"))
+            COMPREPLY=($(compgen -W "$($1 --list-keys 2>/dev/null |
+                command sed -ne \
+                    's@^pub.*/\([^ ]*\).*$@\1@p' -ne \
+                    's@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur"))
+            return
+            ;;
+        --list-secret-keys | --delete-secret-keys | --export-secret-keys | \
+            --export-secret-subkeys | -!(-*)K)
+            # return list of secret keys
+            COMPREPLY=($(compgen -W "$($1 --list-secret-keys 2>/dev/null |
+                command sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur"))
             return
             ;;
         --recipient | -!(-*)r)
-            COMPREPLY=($(compgen -W "$($1 --list-keys 2>/dev/null | command sed -ne \
-                's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur"))
+            COMPREPLY=($(compgen -W "$($1 --list-keys 2>/dev/null |
+                command sed -ne 's@^.*<\([^>]*\)>.*$@\1@p')" -- "$cur"))
             if [[ -e ~/.gnupg/gpg.conf ]]; then
                 COMPREPLY+=($(compgen -W "$(command sed -ne \
                     's@^[ \t]*group[ \t][ \t]*\([^=]*\).*$@\1@p' \
diff --git a/completions/gpg2 b/completions/gpg2
index b3515b7c83b..24defcdc508 100644
--- a/completions/gpg2
+++ b/completions/gpg2
@@ -14,11 +14,14 @@ _gpg2()
             _filedir
             return
             ;;
-        --export | --sign-key | --lsign-key | --nrsign-key | --nrlsign-key | --edit-key)
+        --export | --sign-key | --lsign-key | --nrsign-key | --nrlsign-key | \
+            --edit-key | --delete-keys | --delete-secret-and-public-keys | \
+            --locate-keys | --refresh-keys)
             # return list of public keys
-            COMPREPLY=($(compgen -W "$($1 --list-keys 2>/dev/null | command sed -ne \
-                's@^pub.*/\([^ ]*\).*$@\1@p' -ne \
-                's@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur"))
+            COMPREPLY=($(compgen -W "$($1 --list-keys 2>/dev/null |
+                command sed -ne \
+                    's@^pub.*/\([^ ]*\).*$@\1@p' -ne \
+                    's@^.*\(<\([^>]*\)>\).*$@\2@p')" -- "$cur"))
             return
             ;;
         --recipient | -!(-*)r)