diff --git a/HISTORY b/HISTORY
index fc4299e9..ac7b2da9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2,9 +2,11 @@
         repmgr: remove BDR 2.x support
         repmgr: don't query upstream's data directory (Ian)
         repmgr: rename --recovery-conf-only to --replication-conf-only (Ian)
-        repmgr: ensure postgresql.auto.conf is created with corretc permissions (Ian)
+        repmgr: ensure postgresql.auto.conf is created with correct permissions (Ian)
         repmgr: minimize requirement to check upstream data directory location
           during "standby clone" (Ian)
+        repmgr: report error code on follow/rejoin failure due to non-available
+          replication slot (Ian)
 
 5.0     2019-10-15
         general: add PostgreSQL 12 support (Ian)
diff --git a/doc/appendix-release-notes.xml b/doc/appendix-release-notes.xml
index b3a4e377..883c4b89 100644
--- a/doc/appendix-release-notes.xml
+++ b/doc/appendix-release-notes.xml
@@ -45,6 +45,22 @@
       </para>
     </sect2>
 
+    <sect2>
+      <title>Bug fixes</title>
+      <para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <link linkend="repmgr-standby-follow"><command>repmgr standby follow</command></link> and
+              <link linkend="repmgr-node-rejoin"><command>repmgr node rejoin</command></link> will now return
+              an error code if the operation fails if a replication slot is not available or cannot
+              be created on the follow/rejoin target.
+            </para>
+          </listitem>
+        </itemizedlist>
+      </para>
+    </sect2>
+
   </sect1>
 
   <sect1 id="release-5.0">
diff --git a/repmgr-action-standby.c b/repmgr-action-standby.c
index c1bf754d..918dcebf 100644
--- a/repmgr-action-standby.c
+++ b/repmgr-action-standby.c
@@ -3142,6 +3142,8 @@ do_standby_follow_internal(PGconn *primary_conn, PGconn *follow_target_conn, t_n
 		{
 			log_error("%s", output->data);
 
+			*error_code = general_error_code;
+
 			return false;
 		}
 	}