diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index edb2eb0eee8590e2fb5dca2098049d7bc6918694..d821af5aec9532662c1b690933541d9e696f12fa 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -462,6 +462,9 @@ def ShowClusterConfig(opts, args):
   ToStdout("Default nic parameters:")
   _PrintGroupedParams(result["nicparams"], roman=opts.roman_integers)
 
+  ToStdout("Default disk parameters:")
+  _PrintGroupedParams(result["diskparams"], roman=opts.roman_integers)
+
   ToStdout("Instance policy - limits for instances:")
   for key in constants.IPOLICY_ISPECS:
     ToStdout("  - %s", key)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 8d9931cd8a7300cbd262db937e0a72e48e4a0da9..d47f4d46b1905e9a8dd5c854778a504c6022d30d 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -6177,6 +6177,7 @@ class LUClusterQuery(NoHooksLU):
       "ipolicy": cluster.ipolicy,
       "nicparams": cluster.nicparams,
       "ndparams": cluster.ndparams,
+      "diskparams": cluster.diskparams,
       "candidate_pool_size": cluster.candidate_pool_size,
       "master_netdev": cluster.master_netdev,
       "master_netmask": cluster.master_netmask,