diff --git a/man/gnt-instance.sgml b/man/gnt-instance.sgml
index 5438898cba8f3531b2d3ec1997bc481054f63514..e085cdc428a3bb88d09dfd9a65b3d7d66d04f0db 100644
--- a/man/gnt-instance.sgml
+++ b/man/gnt-instance.sgml
@@ -986,33 +986,44 @@ instance5: 11225
                 to track modifications</simpara>
               </listitem>
             </varlistentry>
-          <varlistentry>
-            <term>ctime</term>
-            <listitem>
-              <para>
-                the creation time of the instance; note that this
-                field contains spaces and as such it's harder to parse
-              </para>
-              <para>
-                if this attribute is not present (e.g. when upgrading
-                from older versions), then "N/A" will be shown instead
-              </para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>mtime</term>
-            <listitem>
-              <para>
-                the last modification time of the instance; note that
-                this field contains spaces and as such it's harder to
-                parse
-              </para>
-              <para>
-                if this attribute is not present (e.g. when upgrading
-                from older versions), then "N/A" will be shown instead
-              </para>
-            </listitem>
-          </varlistentry>
+            <varlistentry>
+              <term>ctime</term>
+              <listitem>
+                <para>
+                  the creation time of the instance; note that this
+                  field contains spaces and as such it's harder to
+                  parse
+                </para>
+                <para>
+                  if this attribute is not present (e.g. when
+                  upgrading from older versions), then "N/A" will be
+                  shown instead
+                </para>
+              </listitem>
+            </varlistentry>
+            <varlistentry>
+              <term>mtime</term>
+              <listitem>
+                <para>
+                  the last modification time of the instance; note
+                  that this field contains spaces and as such it's
+                  harder to parse
+                </para>
+                <para>
+                  if this attribute is not present (e.g. when
+                  upgrading from older versions), then "N/A" will be
+                  shown instead
+                </para>
+              </listitem>
+            </varlistentry>
+
+            <varlistentry>
+              <term>uuid</term>
+              <listitem>
+                <simpara>Show the UUID of the instance (generated
+                automatically by Ganeti)</simpara>
+              </listitem>
+            </varlistentry>
 
             <varlistentry>
               <term>network_port</term>
diff --git a/man/gnt-node.sgml b/man/gnt-node.sgml
index d60810e3c3127f6dab5ce73037683019bb782a37..836fc5d5744e499db9058ccb901eb154b2b6fef1 100644
--- a/man/gnt-node.sgml
+++ b/man/gnt-node.sgml
@@ -411,6 +411,14 @@
               </para>
             </listitem>
           </varlistentry>
+          <varlistentry>
+            <term>uuid</term>
+            <listitem>
+              <simpara>Show the UUID of the node (generated
+                automatically by Ganeti)</simpara>
+            </listitem>
+          </varlistentry>
+
           <varlistentry>
             <term>ctotal</term>
             <listitem>