diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 2d64a45f0cbc9b880c364f5d6fcc3cbb5d8e83f6..a5bfd99751f0f6a7d567f50ca6be9a9ae9e2850a 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3078,6 +3078,7 @@ class LUQueryClusterInfo(NoHooksLU):
       "file_storage_dir": cluster.file_storage_dir,
       "ctime": cluster.ctime,
       "mtime": cluster.mtime,
+      "tags": list(cluster.GetTags()),
       }
 
     return result
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 4ae04a7d903222fb75bc01328f75c0d49cd7603e..342b6135b6ea654961a821b706988889b5f287a4 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -229,6 +229,13 @@ def ShowClusterConfig(opts, args):
   ToStdout("Architecture (this node): %s (%s)",
            result["architecture"][0], result["architecture"][1])
 
+  if result["tags"]:
+    tags = ", ".join(utils.NiceSort(result["tags"]))
+  else:
+    tags = "(none)"
+
+  ToStdout("Tags: %s", tags)
+
   ToStdout("Default hypervisor: %s", result["default_hypervisor"])
   ToStdout("Enabled hypervisors: %s", ", ".join(result["enabled_hypervisors"]))