diff --git a/doc/filelist.sgml b/doc/filelist.sgml
index 0ac4507a..29fe40d3 100644
--- a/doc/filelist.sgml
+++ b/doc/filelist.sgml
@@ -44,6 +44,7 @@
 <!ENTITY follow-new-primary  SYSTEM "follow-new-primary.sgml">
 <!ENTITY switchover  SYSTEM "switchover.sgml">
 <!ENTITY event-notifications  SYSTEM "event-notifications.sgml">
+<!ENTITY upgrading-repmgr  SYSTEM "upgrading-repmgr.sgml">
 
 <!ENTITY repmgrd-automatic-failover SYSTEM "repmgrd-automatic-failover.sgml">
 <!ENTITY repmgrd-configuration SYSTEM "repmgrd-configuration.sgml">
diff --git a/doc/repmgr.sgml b/doc/repmgr.sgml
index 989efda0..ffa1baa0 100644
--- a/doc/repmgr.sgml
+++ b/doc/repmgr.sgml
@@ -74,6 +74,7 @@
   &follow-new-primary;
   &switchover;
   &event-notifications;
+  &upgrading-repmgr;
  </part>
 
  <part id="using-repmgrd">
diff --git a/doc/repmgrd-degraded-monitoring.sgml b/doc/repmgrd-degraded-monitoring.sgml
index adae7236..5a4f5c16 100644
--- a/doc/repmgrd-degraded-monitoring.sgml
+++ b/doc/repmgrd-degraded-monitoring.sgml
@@ -1,9 +1,9 @@
 <chapter id="repmgrd-degraded-monitoring">
  <title>"degraded monitoring" mode</title>
  <para>
-  In certain circumstances, `repmgrd` is not able to fulfill its primary mission
+  In certain circumstances, <command>repmgrd</command> is not able to fulfill its primary mission
   of monitoring the nodes' upstream server. In these cases it enters "degraded
-  monitoring" mode, where `repmgrd` remains active but is waiting for the situation
+  monitoring" mode, where <command>repmgrd</command> remains active but is waiting for the situation
   to be resolved.
  </para>
  <para>
@@ -62,7 +62,8 @@
  </para>
  <para>
   By default, <literal>repmgrd</literal> will continue in degraded monitoring mode indefinitely.
-  However a timeout (in seconds) can be set with <varname>degraded_monitoring_timeout</varname>.
+  However a timeout (in seconds) can be set with <varname>degraded_monitoring_timeout</varname>,
+  after which <command>repmgrd</command> will terminate.
 
  </para>
 
diff --git a/doc/upgrading-repmgr.sgml b/doc/upgrading-repmgr.sgml
new file mode 100644
index 00000000..732a0a4e
--- /dev/null
+++ b/doc/upgrading-repmgr.sgml
@@ -0,0 +1,22 @@
+<chapter id="upgrading-repmgr" xreflabel="Upgrading repmgr">
+ <title>Upgrading repmgr</title>
+ <para>
+  &repmgr; is updated regularly with point releases (e.g. 4.0.1 to 4.0.2)
+  containing bugfixes and other minor improvements. Any substantial new
+  functionality will be included in a feature release (e.g. 4.0.x to 4.1.x).
+ </para>
+ <para>
+  &repmgr; is implemented as a PostgreSQL extension; to upgrade it, first
+  install the updated package, then in the database where the &repmgr;
+  extension is installed, execute <command>ALTER EXTENSION repmgr UPDATE</command>.
+ </para>
+ <para>
+  If <command>repmgrd</command> is running, it may be necessary to restart
+  the PostgreSQL server if the upgrade contains changes to the shared object
+  file used by <command>repmgrd</command>; check the release notes for details.
+ </para>
+ <sect1 id="upgrading-from-repmgr-3">
+  <title>Upgrading from repmgr 3</title>
+ </sect1>
+
+</chapter>