diff --git a/doc/appendix-release-notes.sgml b/doc/appendix-release-notes.sgml
index 56df7c60..40047571 100644
--- a/doc/appendix-release-notes.sgml
+++ b/doc/appendix-release-notes.sgml
@@ -22,6 +22,20 @@
       &repmgr; 4.3 is a major release.
     </para>
 
+	<important>
+	  <para>
+		On Debian-based systems, including Ubuntu, if using <application>repmgrd</application>
+		please ensure that the in the file <filename>/etc/init.d/repmgrd</filename>, the parameter
+		<varname>REPMGRD_OPTS</varname> contains &quot;<literal>--daemonize=false</literal>&quot;, e.g.:
+		<programlisting>
+# additional options
+REPMGRD_OPTS="--daemonize=false"</programlisting>
+	  </para>
+	  <para>
+		For further details, see <link linkend="repmgrd-configuration-debian-ubuntu">repmgrd daemon configuration on Debian/Ubuntu</link>.
+	  </para>
+	</important>
+
     <sect2>
       <title>repmgr enhancements</title>
       <para>
@@ -168,6 +182,20 @@
       <link linkend="upgrading-major-version">Upgrading a major version release</link>.
     </para>
 
+	<important>
+	  <para>
+		On Debian-based systems, including Ubuntu, if using <application>repmgrd</application>
+		please ensure that the in the file <filename>/etc/init.d/repmgrd</filename>, the parameter
+		<varname>REPMGRD_OPTS</varname> contains &quot;<literal>--daemonize=false</literal>&quot;, e.g.:
+		<programlisting>
+# additional options
+REPMGRD_OPTS="--daemonize=false"</programlisting>
+	  </para>
+	  <para>
+		For further details, see <link linkend="repmgrd-configuration-debian-ubuntu">repmgrd daemon configuration on Debian/Ubuntu</link>.
+	  </para>
+	</important>
+
     <sect2>
       <title>Configuration file changes</title>
       <para>
diff --git a/doc/repmgrd-configuration.sgml b/doc/repmgrd-configuration.sgml
index c2a20cc2..56548770 100644
--- a/doc/repmgrd-configuration.sgml
+++ b/doc/repmgrd-configuration.sgml
@@ -401,7 +401,7 @@
         <simpara>
           This is a behaviour change from previous versions (earlier than 4.1), where
           the PID file had to be explicitly specified with the command line
-          parameter <option> --pid-file</option>.
+          parameter <option>--pid-file</option>.
         </simpara>
       </note>
       <para>
@@ -421,7 +421,7 @@
       </para>
       <para>
         If none of the above apply, <application>repmgrd</application> will create a PID file
-        in the operating system's temporary directory (das etermined by the environment variable
+        in the operating system's temporary directory (as setermined by the environment variable
         <varname>TMPDIR</varname>, or if that is not set, will use <filename>/tmp</filename>).
       </para>
       <para>
diff --git a/repmgr.conf.sample b/repmgr.conf.sample
index 1612508a..4ed78b5f 100644
--- a/repmgr.conf.sample
+++ b/repmgr.conf.sample
@@ -272,11 +272,6 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 # These settings are only applied when repmgrd is running. Values shown
 # are defaults.
 
-#repmgrd_pid_file=			# Path of PID file to use for repmgrd; if not set, a PID file will
-					# be generated in a temporary directory specified by the environment
-					# variable $TMPDIR, or if not set, in "/tmp". This value can be overridden
-					# by the command line option "-p/--pid-file"; the command line option
-					# "--no-pid-file" will force PID file creation to be skipped.
 #failover=manual			# one of 'automatic', 'manual'.
 					# determines what action to take in the event of upstream failure
 					#
@@ -317,6 +312,13 @@ ssh_options='-q -o ConnectTimeout=10'	# Options to append to "ssh"
 					# disables the timeout completely.
 #async_query_timeout=60			# Interval (in seconds) which repmgrd will wait before
 					# cancelling an asynchronous query.
+#repmgrd_pid_file=			# Path of PID file to use for repmgrd; if not set, a PID file will
+					# be generated in a temporary directory specified by the environment
+					# variable $TMPDIR, or if not set, in "/tmp". This value can be overridden
+					# by the command line option "-p/--pid-file"; the command line option
+					# "--no-pid-file" will force PID file creation to be skipped.
+					# Note: there is normally no need to set this, particularly if
+					# repmgr was installed from packages.
 
 #------------------------------------------------------------------------------
 # service control commands