diff --git a/custom/plugins/puppet/_puppet b/custom/plugins/puppet/_puppet
index 8f0c7e07d..0cc1fa6d1 100644
--- a/custom/plugins/puppet/_puppet
+++ b/custom/plugins/puppet/_puppet
@@ -163,6 +163,11 @@ _certificate_revocation_list_arguments=(
   info       Print the default terminus class for this face.
   save       Invalid for this subcommand.
   search     Invalid for this subcommand.
+  '--render-as:FORMAT The rendering format to use'
+  '--verbose:Whether to log verbosely'
+  '--debug:Whether to log debug information'
+  '--extra HASH:Extra arguments to pass to the indirection request'
+  '--terminus: TERMINUS The indirector terminus to use'
 )
 
 __task_list ()
@@ -277,6 +282,23 @@ __puppet-certificate ()
   esac
 }
 
+__puppet-certificate_revocation_list ()
+{
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+  case $state in
+    (command)
+      _describe -t commands "gem subcommand" _certificate_revocation_list_arguments
+      return
+    ;;
+  esac
+}
+
 
 
 local expl
@@ -331,6 +353,11 @@ case $state in
       (certificate)
           __puppet-certificate
       ;;
+
+      # Display sub-commands for puppet certificate_revocation_list.
+      (certificate)
+          __puppet-certificate_revocation_list
+      ;;
     esac
   ;;
 esac