diff --git a/doc/html/gres.shtml b/doc/html/gres.shtml
index b3c5535f92ba270e658ffe1bb65d02053fa17063..e88795421411db65b3d3664499d702dd49da382e 100644
--- a/doc/html/gres.shtml
+++ b/doc/html/gres.shtml
@@ -43,7 +43,8 @@ values in <I>slurm.conf</I> ).</LI>
 The default value is set to the number of <B>File</B> values specified (if any),
 otherwise the default value is one. A suffix of "K", "M" or "G" may be used
 to mulitply the number by 1024, 1048576 or 1073741824 respectively
-(e.g. "Count=10G").</LI>
+(e.g. "Count=10G"). Note that Count is a 32-bit field and the maximum value
+is 4,294,967,295.</LI>
 
 <LI><B>CPUs</B> Specify the CPU index numbers for the specific CPUs which can
 use this resources. For example, it may be strongly preferable to use specific
@@ -150,6 +151,6 @@ JobStep=1234.2 CUDA_VISIBLE_DEVICES=3
 file and insure they are in the increasing numeric order.</P>
 <!-------------------------------------------------------------------------->
 
-<p style="text-align: center;">Last modified 8 May 2012</p>
+<p style="text-align: center;">Last modified 2 July 2012</p>
 
 </body></html>
diff --git a/doc/man/man5/gres.conf.5 b/doc/man/man5/gres.conf.5
index 455a03d1b467ad6f9c5ff53b98b8eed625089fc9..09413dc52c4ea81e7c942861690515ff32f17e96 100644
--- a/doc/man/man5/gres.conf.5
+++ b/doc/man/man5/gres.conf.5
@@ -1,4 +1,4 @@
-.TH "gres.conf" "5" "April 2012" "gres.conf 2.3" "Slurm configuration file"
+.TH "gres.conf" "5" "July 2012" "gres.conf 2.3" "Slurm configuration file"
 .SH "NAME"
 gres.conf \- Slurm configuration file for generic resource management.
 
@@ -28,6 +28,8 @@ Number of resources of this type available on this node.
 The default value is set to the number of \fBFile\fR values specified (if any),
 otherwise the default value is one. A suffix of "K", "M" or "G" may be used
 to mulitply the number by 1024, 1048576 or 1073741824 respectively.
+Note that Count is a 32\-bit field and the maximum value is 4,294,967,295.
+ 
 
 .TP
 \fBCPUs\fR
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 8eddacbc8f9282615c51959aefec247db8c4dd9f..998b2249e980cb6bf099eff26a51b810cfd149b5 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -2381,7 +2381,8 @@ colon with a numeric value (default value is one)
 (e.g. "Gres=bandwidth:10000,gpu:2").
 A suffix of "K", "M" or "G" may be used to mulitply the number by 1024,
 1048576 or 1073741824 respectively (e.g. "Gres=bandwidth:4G,gpu:4")..
-By default a node has no generic resources.
+By default a node has no generic resources and its maximum count is
+4,294,967,295.
 Also see \fBFeature\fR.
 
 .TP