diff --git a/lib/objects.py b/lib/objects.py
index 51e13f883eebb5fb39d53493e17b23d2f2626330..2fdf7bce8b342cf6338b2e8342a7353108076121 100644
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -1474,6 +1474,7 @@ class Cluster(TaggableObject):
     "prealloc_wipe_disks",
     "hv_state_static",
     "disk_state_static",
+    "enabled_storage_types",
     ] + _TIMESTAMPS + _UUID
 
   def UpgradeConfig(self):
diff --git a/src/Ganeti/Objects.hs b/src/Ganeti/Objects.hs
index 6f2055c887aa28dd83412f4c54a88812c81c9716..7e85cf1b32f8e9e6fd0fe25cfe76078d6c0b38ef 100644
--- a/src/Ganeti/Objects.hs
+++ b/src/Ganeti/Objects.hs
@@ -681,6 +681,7 @@ $(buildObject "Cluster" "cluster" $
   , simpleField "primary_ip_family"       [t| IpFamily         |]
   , simpleField "prealloc_wipe_disks"     [t| Bool             |]
   , simpleField "ipolicy"                 [t| FilledIPolicy    |]
+  , simpleField "enabled_storage_types"   [t| [StorageType]    |]
  ]
  ++ timeStampFields
  ++ uuidFields
diff --git a/src/Ganeti/Types.hs b/src/Ganeti/Types.hs
index 1753ce6824aabeb5cb7532797cbe734ae4f9f8f1..810049a3cdf94d8ea39e8e9f5c1d5f072118a192 100644
--- a/src/Ganeti/Types.hs
+++ b/src/Ganeti/Types.hs
@@ -302,6 +302,11 @@ $(THH.declareSADT "StorageType"
   [ ("StorageFile", 'C.stFile)
   , ("StorageLvmPv", 'C.stLvmPv)
   , ("StorageLvmVg", 'C.stLvmVg)
+  , ("StorageDiskless", 'C.stDiskless)
+  , ("StorageSharedFile", 'C.stSharedFile)
+  , ("StorageBlock", 'C.stBlock)
+  , ("StorageRados", 'C.stRados)
+  , ("StorageExt", 'C.stExt)
   ])
 $(THH.makeJSONInstance ''StorageType)