diff --git a/lib/cli.py b/lib/cli.py
index cc194064a3dc0aa991ae0df0d3e3ff3a895bafa6..ca3a7b6e2b34a82149849ede633c2ec4bf7c0267 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -2608,10 +2608,10 @@ def GenericListFields(resource, fields, separator, header, cl=None):
   columns = [
     TableColumn("Name", str, False),
     TableColumn("Title", str, False),
-    # TODO: Add field description to master daemon
+    TableColumn("Description", str, False),
     ]
 
-  rows = [[fdef.name, fdef.title] for fdef in response.fields]
+  rows = [[fdef.name, fdef.title, fdef.doc] for fdef in response.fields]
 
   for line in FormatTable(rows, columns, header, separator):
     ToStdout(line)