diff --git a/HISTORY b/HISTORY
index c1af9227..9fdfa0e4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6,6 +6,8 @@
           an existing directory is being overwritten (Ian)
         repmgr: improve "--dry-run" behaviour for "standby promote" and
           "standby switchover" (Ian)
+        repmgr: when running "standby clone" with the "--upstream-conninfo" option
+          ensure that "application_name" is set correctly in "primary_conninfo" (Ian)
         repmgr: ensure "--dry-run" together with --force when running "standby clone"
           in barman mode does not modify an existing data directory (Ian)
         repmgr: improve "--dry-run" output when running "standby clone" in
diff --git a/doc/appendix-release-notes.xml b/doc/appendix-release-notes.xml
index 700adba3..872842c0 100644
--- a/doc/appendix-release-notes.xml
+++ b/doc/appendix-release-notes.xml
@@ -221,6 +221,14 @@
             </para>
           </listitem>
 
+		  <listitem>
+			<para>
+              &repmgr;: when executing <link linkend="repmgr-standby-clone"><command>repmgr standby clone</command></link>
+              with the <option>--upstream-conninfo</option>, ensure that <varname>application_name</varname>
+              is set correctly in <varname>primary_conninfo</varname>.
+            </para>
+          </listitem>
+
 		  <listitem>
 			<para>
               &repmgr;: when executing <link linkend="repmgr-standby-switchover"><command>repmgr standby switchover</command></link>,
diff --git a/doc/repmgr-standby-clone.xml b/doc/repmgr-standby-clone.xml
index 36e00473..dcdfe163 100644
--- a/doc/repmgr-standby-clone.xml
+++ b/doc/repmgr-standby-clone.xml
@@ -326,9 +326,13 @@
         <term><option>--upstream-conninfo</option></term>
         <listitem>
           <para>
-            <literal>primary_conninfo</literal> value to write in recovery.conf
+            <literal>primary_conninfo</literal> value to write in <filename>recovery.conf</filename>
             when the intended upstream server does not yet exist.
           </para>
+          <para>
+            Note that &repmgr; may modify the provided value, in particular to set the
+            correct <literal>application_name</literal>.
+          </para>
         </listitem>
       </varlistentry>
 
diff --git a/repmgr-action-standby.c b/repmgr-action-standby.c
index f59d1172..a29a0d94 100644
--- a/repmgr-action-standby.c
+++ b/repmgr-action-standby.c
@@ -2991,7 +2991,7 @@ do_standby_follow_internal(PGconn *primary_conn, PGconn *follow_target_conn, t_n
 		}
 	}
 
-	/* Initialise connection parameters to write as `primary_conninfo` */
+	/* Initialise connection parameters to write as "primary_conninfo" */
 	initialize_conninfo_params(&recovery_conninfo, false);
 
 	/* We ignore any application_name set in the primary's conninfo */