diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng
index 976a02baeb66092e0071ab2666855bca07cd5140..ff0d3c836c8c68a62b3b1f70c43a5dd711459641 100644
--- a/docs/schemas/storagepool.rng
+++ b/docs/schemas/storagepool.rng
@@ -451,6 +451,7 @@
             <value>hfs+</value>
             <value>xfs</value>
             <value>ocfs2</value>
+            <value>vmfs</value>
           </choice>
         </attribute>
       </element>
diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng
index 32aaa2784d406238c12d91ca64aea386b23f4c43..382cd121add1af2c4a1d5a412d8139f8a289bf9b 100644
--- a/docs/schemas/storagevol.rng
+++ b/docs/schemas/storagevol.rng
@@ -194,6 +194,7 @@
       <value>hfs+</value>
       <value>xfs</value>
       <value>ocfs2</value>
+      <value>vmfs</value>
     </choice>
   </define>
 
diff --git a/docs/storage.html.in b/docs/storage.html.in
index e0e4edec1e223f286e06818e66dca0103b4c746b..72fa13944a226db17ab84b3e94fa1e2b31a29a10 100644
--- a/docs/storage.html.in
+++ b/docs/storage.html.in
@@ -202,6 +202,9 @@
       <li>
         <code>ocfs2</code>
       </li>
+      <li>
+        <code>vmfs</code>
+      </li>
     </ul>
 
     <h3>Valid volume format types</h3>
diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index fd640bfa2bad6be188b80f96d04a68b8de687c63..252d28cbfb91dc84ff42ccf2e60f568cc2df339b 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -67,6 +67,7 @@ VIR_ENUM_IMPL(virStoragePoolFormatFileSystem,
               "auto", "ext2", "ext3",
               "ext4", "ufs", "iso9660", "udf",
               "gfs", "gfs2", "vfat", "hfs+", "xfs", "ocfs2",
+              "vmfs",
 );
 
 VIR_ENUM_IMPL(virStoragePoolFormatFileSystemNet,
diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h
index d2600efff04de3d8aee9c249c2029c19fe67d829..c0baeffc1c811701a059ee4cc31f1251c20d2faf 100644
--- a/src/conf/storage_conf.h
+++ b/src/conf/storage_conf.h
@@ -362,6 +362,7 @@ typedef enum {
     VIR_STORAGE_POOL_FS_HFSPLUS,
     VIR_STORAGE_POOL_FS_XFS,
     VIR_STORAGE_POOL_FS_OCFS2,
+    VIR_STORAGE_POOL_FS_VMFS,
     VIR_STORAGE_POOL_FS_LAST,
 } virStoragePoolFormatFileSystem;
 VIR_ENUM_DECL(virStoragePoolFormatFileSystem);
diff --git a/tests/storagepoolcapsschemadata/poolcaps-fs.xml b/tests/storagepoolcapsschemadata/poolcaps-fs.xml
index 182fa398f53c82ac36133dd0acbff105f788d735..eee75af746c1348cf977fa5d111f09b145dd3f70 100644
--- a/tests/storagepoolcapsschemadata/poolcaps-fs.xml
+++ b/tests/storagepoolcapsschemadata/poolcaps-fs.xml
@@ -40,6 +40,7 @@
         <value>hfs+</value>
         <value>xfs</value>
         <value>ocfs2</value>
+        <value>vmfs</value>
       </enum>
     </poolOptions>
     <volOptions>
diff --git a/tests/storagepoolcapsschemadata/poolcaps-full.xml b/tests/storagepoolcapsschemadata/poolcaps-full.xml
index 980c6d210e5093ee51b00a7f6a1eaf1397f17ef5..805950a937985d8ebe9068591da8675c45b29ebc 100644
--- a/tests/storagepoolcapsschemadata/poolcaps-full.xml
+++ b/tests/storagepoolcapsschemadata/poolcaps-full.xml
@@ -40,6 +40,7 @@
         <value>hfs+</value>
         <value>xfs</value>
         <value>ocfs2</value>
+        <value>vmfs</value>
       </enum>
     </poolOptions>
     <volOptions>