diff --git a/doc/repmgr-witness-register.sgml b/doc/repmgr-witness-register.sgml
index d6d7a676..3f5e5b86 100644
--- a/doc/repmgr-witness-register.sgml
+++ b/doc/repmgr-witness-register.sgml
@@ -28,7 +28,7 @@
     </para>
     <para>
       In most cases it's only necessary to provide the primary's hostname with
-      the <option>-h</option>/<option>--hostname</option> option; &repmgr; will
+      the <option>-h</option>/<option>--host</option> option; &repmgr; will
       automatically use the <varname>user</varname> and <varname>dbname</varname>
       values defined in the <varname>conninfo</varname> string defined in the
       witness node's <filename>repmgr.conf</filename>, unless these are explicitly
diff --git a/repmgr-action-witness.c b/repmgr-action-witness.c
index e487d2e7..fdff30ac 100644
--- a/repmgr-action-witness.c
+++ b/repmgr-action-witness.c
@@ -490,9 +490,9 @@ void do_witness_help(void)
 	printf(_("  \"witness register\" registers a witness node.\n"));
 	puts("");
 	printf(_("  Requires provision of connection information for the primary node,\n"));
-	printf(_("  typically usually just the hostname.\n"));
+	printf(_("  typically usually just the host name.\n"));
 	puts("");
-	printf(_("  -h/--hostname            hostname of the primary node\n"));
+	printf(_("  -h/--host                host name of the primary node\n"));
 	printf(_("  --dry-run                check prerequisites but don't make any changes\n"));
 	printf(_("  -F, --force              overwrite an existing node record\n"));
 	puts("");
diff --git a/repmgr-client.c b/repmgr-client.c
index 565af405..b87304b2 100644
--- a/repmgr-client.c
+++ b/repmgr-client.c
@@ -1409,7 +1409,7 @@ check_cli_parameters(const int action)
 					if (!runtime_options.host_param_provided)
 					{
 						item_list_append_format(&cli_errors,
-												_("host name for the source node must be provided with -h/--hostname when executing %s"),
+												_("host name for the source node must be provided with -h/--host when executing %s"),
 												action_name(action));
 					}
 
@@ -1466,7 +1466,7 @@ check_cli_parameters(const int action)
 				if (!runtime_options.host_param_provided)
 				{
 					item_list_append_format(&cli_errors,
-											_("host name for the source node must be provided with -h/--hostname when executing %s"),
+											_("host name for the source node must be provided with -h/--host when executing %s"),
 											action_name(action));
 				}
 			}