diff --git a/src/ssh-generator/ssh-issue.c b/src/ssh-generator/ssh-issue.c
index dd2b2370b4..1d87624aae 100644
--- a/src/ssh-generator/ssh-issue.c
+++ b/src/ssh-generator/ssh-issue.c
@@ -3,18 +3,16 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "sd-json.h"
+
 #include "alloc-util.h"
-#include "ansi-color.h"
 #include "build.h"
 #include "fd-util.h"
-#include "format-table.h"
 #include "fs-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "mkdir.h"
-#include "options.h"
 #include "parse-argument.h"
-#include "pretty-print.h"
 #include "ssh-util.h"
 #include "string-util.h"
 #include "strv.h"
@@ -27,6 +25,12 @@ static bool arg_issue_stdout = false;
 
 STATIC_DESTRUCTOR_REGISTER(arg_issue_path, freep);
 
+COMMAND(
+        "systemd-ssh-issue\0",
+        "Create or remove the /run/issue.d/ file announcing the SSH VSOCK address.",
+        .man_pages = "systemd-ssh-issue.1\0",
+);
+
 static int acquire_cid(unsigned *ret_cid) {
         int r;
 
@@ -113,47 +117,6 @@ static int verb_rm_vsock(int argc, char *argv[], uintptr_t _data, void *_userdat
         return 0;
 }
 
-static int help(void) {
-        _cleanup_free_ char *link = NULL;
-        _cleanup_(table_unrefp) Table *options = NULL, *verbs = NULL;
-        int r;
-
-        r = terminal_urlify_man("systemd-ssh-issue", "1", &link);
-        if (r < 0)
-                return log_oom();
-
-        r = verbs_get_help_table(&verbs);
-        if (r < 0)
-                return r;
-
-        r = option_parser_get_help_table(&options);
-        if (r < 0)
-                return r;
-
-        (void) table_sync_column_widths(0, verbs, options);
-
-        printf("%s [OPTIONS...] COMMAND\n"
-               "\n%sCreate/remove ssh /run/issue.d/ file reporting VSOCK address.%s\n"
-               "\n%sCommands:%s\n",
-               program_invocation_short_name,
-               ansi_highlight(), ansi_normal(),
-               ansi_underline(), ansi_normal());
-
-        r = table_print_or_warn(verbs);
-        if (r < 0)
-                return r;
-
-        printf("\n%sOptions:%s\n",
-               ansi_underline(), ansi_normal());
-
-        r = table_print_or_warn(options);
-        if (r < 0)
-                return r;
-
-        printf("\nSee the %s for details.\n", link);
-        return 0;
-}
-
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
         assert(argv);
@@ -167,7 +130,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return help();
+                        return command_print_help("systemd-ssh-issue");
 
                 OPTION_COMMON_VERSION:
                         return version();
@@ -191,6 +154,9 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
 
                         arg_issue_stdout = false;
                         break;
+
+                OPTION_COMMON_INTROSPECT_CLI:
+                        return introspect_cli(SD_JSON_FORMAT_OFF);
                 }
 
         if (!arg_issue_path && !arg_issue_stdout) {
diff --git a/test/units/TEST-74-AUX-UTILS.introspect-cli.sh b/test/units/TEST-74-AUX-UTILS.introspect-cli.sh
index 0b498589de..7f88682118 100755
--- a/test/units/TEST-74-AUX-UTILS.introspect-cli.sh
+++ b/test/units/TEST-74-AUX-UTILS.introspect-cli.sh
@@ -67,6 +67,7 @@ INTROSPECTABLE=(
     systemd-sleep
     systemd-socket-activate
     systemd-socket-proxyd
+    systemd-ssh-issue
     systemd-stdio-bridge
     systemd-storage-block
     systemd-storage-fs