diff --git a/man/gnt-instance.sgml b/man/gnt-instance.sgml
index e4d1a6265bd31b80e7d2ebaf8ffc6894a9f3909c..14f6c5108ec46c97135fd2a616d8fc4c067af966 100644
--- a/man/gnt-instance.sgml
+++ b/man/gnt-instance.sgml
@@ -960,14 +960,14 @@ instance5: 11225
             </varlistentry>
 
             <varlistentry>
-              <term>mode</term>
+              <term>nic_mode</term>
               <listitem>
                 <simpara>the mode of the first instance NIC
                 (routed or bridged)</simpara>
               </listitem>
             </varlistentry>
             <varlistentry>
-              <term>link</term>
+              <term>nic_link</term>
               <listitem>
                 <simpara>the link of the first instance NIC
                 </simpara>
diff --git a/scripts/gnt-instance b/scripts/gnt-instance
index 429c75c4c3d343335ace1ff24aace1716d549d48..711727ba930831af953b40de216fbe6774a7d8f4 100755
--- a/scripts/gnt-instance
+++ b/scripts/gnt-instance
@@ -1329,7 +1329,11 @@ commands = {
     "Lists the instances and their status. The available fields are"
     " (see the man page for details): status, oper_state, oper_ram,"
     " name, os, pnode, snodes, admin_state, admin_ram, disk_template,"
-    " ip, mac, mode, link, sda_size, sdb_size, vcpus, serial_no,"
+    " ip, mac, nic_mode, nic_link, sda_size, sdb_size, vcpus, serial_no,"
+    " nic.count, nic.mac/N, nic.ip/N, nic.mode/N, nic.link/N,"
+    " nic.macs, nic.ips, nic.modes, nic.links,"
+    " disk.count, disk.size/N, disk.sizes,"
+    " hv/NAME, be/memory, be/vcpus, be/auto_balance,"
     " hypervisor."
     " The default field"
     " list is (in order): %s." % ", ".join(_LIST_DEF_FIELDS),