diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 4a36d5bfb6415d7add8cbc7d4369aa7171ea8445..e65aef896323aa8d3fd765094215b8d05006bc15 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -2623,6 +2623,7 @@ class LUQueryClusterInfo(NoHooksLU):
       "master_netdev": cluster.master_netdev,
       "volume_group_name": cluster.volume_group_name,
       "file_storage_dir": cluster.file_storage_dir,
+      "tags": list(cluster.GetTags()),
       }
 
     return result
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index fff42bb1f858580193b3965c219d92a678309923..2d53d1d6a0d66a925ee6b084bfd397258cebb654 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -228,6 +228,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"]))