diff --git a/utils/generate-command-help.rb b/utils/generate-command-help.rb
index e57acf4b9..929761b24 100755
--- a/utils/generate-command-help.rb
+++ b/utils/generate-command-help.rb
@@ -25,9 +25,15 @@ GROUPS_BY_NAME = Hash[*
 ].freeze
 
 def argument arg
-  name = arg["name"].is_a?(Array) ? arg["name"].join(" ") : arg["name"]
-  name = arg["enum"].join "|" if "enum" == arg["type"]
-  name = arg["command"] + " " + name if arg["command"]
+  if "block" == arg["type"]
+    name = arg["block"].map do |entry|
+      argument entry
+    end.join " "
+  else
+    name = arg["name"].is_a?(Array) ? arg["name"].join(" ") : arg["name"]
+    name = arg["enum"].join "|" if "enum" == arg["type"]
+    name = arg["command"] + (name ? " " + name : "") if arg["command"]
+  end
   if arg["multiple"]
     name = "#{name} [#{name} ...]"
   end