diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 5290d2c66b3d3bdaf884e1943feb1b5deb7e3294..5e0de510c3cf20bffad2336c8126650325ee37e2 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1999,6 +1999,7 @@ class LUQueryClusterInfo(NoHooksLU):
       "export_version": constants.EXPORT_VERSION,
       "master": self.sstore.GetMasterNode(),
       "architecture": (platform.architecture()[0], platform.machine()),
+      "hypervisor_type": self.sstore.GetHypervisorType(),
       }
 
     return result
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 036b30e35ed1c1abcd816e98a3cae9fe6e271caa..59437de7ad045eb8e4c2d0be36c05d6f74c5fcbf 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -141,6 +141,8 @@ def ShowClusterConfig(opts, args):
   print ("Architecture (this node): %s (%s)" %
          (result["architecture"][0], result["architecture"][1]))
 
+  print ("Cluster hypervisor: %s" % result["hypervisor_type"])
+
   return 0