diff --git a/repmgr.c b/repmgr.c
index 9fca281a..b7b90eeb 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -2211,16 +2211,18 @@ do_witness_create(void)
 static void
 help(const char *progname)
 {
-	printf(_("\n%s: Replicator manager \n"), progname);
+	printf(_("%s: replication management tool for PostgreSQL\n"), progname);
+	printf(_("\n"));
 	printf(_("Usage:\n"));
-	printf(_(" %s [OPTIONS] master  {register}\n"), progname);
-	printf(_(" %s [OPTIONS] standby {register|clone|promote|follow}\n"),
+	printf(_("  %s [OPTIONS] master  {register}\n"), progname);
+	printf(_("  %s [OPTIONS] standby {register|clone|promote|follow}\n"),
 		   progname);
-	printf(_(" %s [OPTIONS] cluster {show|cleanup}\n"), progname);
-	printf(_("\nGeneral options:\n"));
-	printf(_("  --help                              show this help, then exit\n"));
-	printf(_("  --version                           output version information, then exit\n"));
-	printf(_("  --verbose                           output verbose activity information\n"));
+	printf(_("  %s [OPTIONS] cluster {show|cleanup}\n"), progname);
+	printf(_("\n"));
+	printf(_("General options:\n"));
+	printf(_("  -?, --help                          show this help, then exit\n"));
+	printf(_("  -V, --version                       output version information, then exit\n"));
+	printf(_("  -v, --verbose                       output verbose activity information\n"));
 	printf(_("\nConnection options:\n"));
 	printf(_("  -d, --dbname=DBNAME                 database to connect to\n"));
 	printf(_("  -h, --host=HOSTNAME                 database server host or socket directory\n"));
diff --git a/repmgrd.c b/repmgrd.c
index 48cabb77..6da172b2 100644
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -1971,17 +1971,21 @@ usage(void)
 void
 help(const char *progname)
 {
-	printf(_("Usage: %s [OPTIONS]\n"), progname);
-	printf(_("Replicator manager daemon for PostgreSQL.\n"));
-	printf(_("\nOptions:\n"));
-	printf(_("  --help                    show this help, then exit\n"));
-	printf(_("  --version                 output version information, then exit\n"));
+	printf(_("%s: replication management daemon for PostgreSQL\n"), progname);
+	printf(_("\n"));
+	printf(_("Usage:\n"));
+	printf(_("  %s [OPTIONS]\n"), progname);
+	printf(_("\n"));
+	printf(_("Options:\n"));
+	printf(_("  -?, --help                show this help, then exit\n"));
+	printf(_("  -V, --version             output version information, then exit\n"));
 	printf(_("  -v, --verbose             output verbose activity information\n"));
 	printf(_("  -m, --monitoring-history  track advance or lag of the replication in every standby in repl_monitor\n"));
 	printf(_("  -f, --config-file=PATH    path to the configuration file\n"));
 	printf(_("  -d, --daemonize           detach process from foreground\n"));
 	printf(_("  -p, --pid-file=PATH       write a PID file\n"));
-	printf(_("\n%s monitors a cluster of servers.\n"), progname);
+	printf(_("\n"));
+	printf(_("%s monitors a cluster of servers and optionally performs failover.\n"), progname);
 }