diff --git a/HISTORY b/HISTORY
index 9cc4b357..a5531ae5 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,19 @@
 4.0.6   2018-06-??
-        repmgr: prevent registration of a witness server with the same name as
-          an existing node (Ian)
+        repmgr: (witness register) prevent registration of a witness server with the
+ 		  same name as an existing node (Ian)
+		repmgr: (standby follow) check node has actually connected to new primary
+		  before reporting success; GitHub #444 (Ian)
+		repmgr: (standby clone) improve handling of external configuration file copying,
+		  including consideration in --dry-run check; GitHub #443 (Ian)
+		repmgr: (standby clone) don't require presence of "user" parameter in
+		  conninfo string; GitHub #437 (Ian)
+		repmgr: (standby clone) improve documentation of --recovery-conf-only
+		  mode; GitHub #438 (Ian)
+		repmgr: (node rejoin) fix bug when parsing --config-files parameter;
+		  GitHub #442 (Ian)
+		repmgr: when using --dry-run, force log level to INFO to ensure output
+		  will always be displayed; GitHub #441 (Ian)
+		repmgrd: ensure local node is counted as quorum member; GitHub #439 (Ian)
 
 4.0.5   2018-05-02
         repmgr: poll demoted primary after restart as a standby during a
diff --git a/doc/appendix-release-notes.sgml b/doc/appendix-release-notes.sgml
index 01337c59..e361c177 100644
--- a/doc/appendix-release-notes.sgml
+++ b/doc/appendix-release-notes.sgml
@@ -19,7 +19,14 @@
     <title>Release 4.0.6</title>
     <para><emphasis>June ??, 2018</emphasis></para>
     <para>
+	  &repmgr; 4.0.6 contains a number of bug fixes and usability enhancements.
     </para>
+	<para>
+	  We recommend upgrading to this version as soon as possible.
+	  This release can be installed as a simple package upgrade from repmgr 4.0 ~ 4.0.5;
+      <application>repmgrd</application> (if running) should be restarted. See <xref linkend="upgrading-repmgr">
+      for more details.
+	</para>
 
     <sect2>
       <title>Bug fixes</title>
@@ -34,6 +41,64 @@
            </para>
           </listitem>
 
+
+          <listitem>
+            <para>
+               <command><link linkend="repmgr-standby-follow">repmgr standby follow</link></command>:
+			   check node has actually connected to new primary before reporting success
+			   (GitHub #444)
+           </para>
+          </listitem>
+
+
+          <listitem>
+            <para>
+               <command><link linkend="repmgr-standby-clone">repmgr standby clone</link></command>:
+			   Improve handling of external configuration file copying,  including consideration in
+			   <option>--dry-run</option> check
+			   (GitHub #443)
+           </para>
+          </listitem>
+
+          <listitem>
+            <para>
+               <command><link linkend="repmgr-standby-clone">repmgr standby clone</link></command>:
+			   Don't require presence of <varname>user</varname> parameter in conninfo string
+			   (GitHub #437)
+           </para>
+          </listitem>
+
+          <listitem>
+            <para>
+               <command><link linkend="repmgr-standby-clone">repmgr standby clone</link></command>:
+			   Improve documentation of <option>--recovery-conf-only</option> mode
+			   (GitHub #438)
+           </para>
+          </listitem>
+
+          <listitem>
+            <para>
+               <command><link linkend="repmgr-node-rejoin">repmgr node rejoin</link></command>:
+			   Fix bug when parsing <option>--config-files</option> parameter
+			   (GitHub #442)
+           </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              When using <option>--dry-run</option>, force log level to <literal>INFO</literal>
+			  to ensure output will always be displayed
+			  (GitHub #441)
+           </para>
+          </listitem>
+
+          <listitem>
+            <para>
+              <application>repmgrd</application>: ensure local node is counted as quorum member
+			  (GitHub #439)
+           </para>
+          </listitem>
+
         </itemizedlist>
       </para>
     </sect2>