diff --git a/doc/html/acct_gather_energy_plugins.shtml b/doc/html/acct_gather_energy_plugins.shtml
index 48df1a80b60b70a819bbfff8299dc49eb613fe65..b0b9a97c513e17d9f2787bb0561acabff9aadc04 100644
--- a/doc/html/acct_gather_energy_plugins.shtml
+++ b/doc/html/acct_gather_energy_plugins.shtml
@@ -25,6 +25,8 @@ for the type of energy accounting. We currently use
 <li><b>none</b> &mdash; No energy consumption data is provided.
 <li><b>ipmi</b> &mdash; Gets energy consumption data from the
 BMC (Baseboard Management Controller) using the
+<li><b>pm_counters</b> &mdash; Energy consumption data is collected from the
+Baseboard Management Controller (BMC) for HPE Cray systems.
 IPMI (Intelligent Platform Management Interface) tool.
 <li><b>rapl</b> &mdash; Gets energy consumption data from hardware sensors on each
 core/socket, using RAPL (Running Average Power Limit) sensors. Note that
@@ -123,7 +125,7 @@ plugin and the frequency at which to gather node energy data.</p>
 </dl>
 
 
-<p style="text-align:center;">Last modified 14 April 2020</p>
+<p style="text-align:center;">Last modified 20 August 2020</p>
 
 <!--#include virtual="footer.txt"-->
 
diff --git a/doc/html/cray.shtml b/doc/html/cray.shtml
index 5c63c0af0274b5ddeb9ac9ad0fbbe9277dcfa8ab..a372c7118a65498cd975952e518cda2b468378a1 100644
--- a/doc/html/cray.shtml
+++ b/doc/html/cray.shtml
@@ -76,6 +76,13 @@
   normal configuration.
 <ul>
 
+<li>AcctGatherEnergyType</li>
+<p>
+  Set <b><i>AcctGatherEnergyType=acct_gather_energy/pm_counters/i></b> to
+  have the Cray XC baseboard management controller report energy usage
+  data to Slurm.
+</p>
+
 <li>BurstBuffer</li>
 <p>
   Set <b><i>BurstBufferPlugins=burst_buffer/datawarp</i></b> to use.
@@ -211,6 +218,6 @@ is down and prevents any new jobs from being started.
 </p>
 
 
-<p style="text-align:center;">Last modified 7 March 2019</p>
+<p style="text-align:center;">Last modified 20 August 2020</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 53031dcb81999ac15084276bab37d13963aae838..65758de961a1255be38387da65c5218ea08922a0 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -242,14 +242,18 @@ No energy consumption data is collected.
 Energy consumption data is collected from the Baseboard Management Controller
 (BMC) using the Intelligent Platform Management Interface (IPMI).
 .TP
-\fBacct_gather_energy/xcc\fR
-Energy consumption data is collected from the Lenovo SD650 XClarity Controller
-(XCC) using IPMI OEM raw commands.
+\fBacct_gather_energy/pm_counters\fR
+Energy consumption data is collected from the Baseboard Management
+Controller (BMC) for HPE Cray systems.
 .TP
 \fBacct_gather_energy/rapl\fR
 Energy consumption data is collected from hardware sensors using the Running
 Average Power Limit (RAPL) mechanism. Note that enabling RAPL may require the
 execution of the command "sudo modprobe msr".
+.TP
+\fBacct_gather_energy/xcc\fR
+Energy consumption data is collected from the Lenovo SD650 XClarity Controller
+(XCC) using IPMI OEM raw commands.
 .RE
 
 .TP