diff --git a/www/manager/Makefile b/www/manager/Makefile
index fa0b5858..6b85683e 100644
--- a/www/manager/Makefile
+++ b/www/manager/Makefile
@@ -135,6 +135,7 @@ JSSRC= 				                 	\
 	storage/RBDEdit.js				\
 	storage/SheepdogEdit.js				\
 	storage/NexentaEdit.js				\
+	storage/ZFSEdit.js				\
 	dc/Summary.js					\
 	dc/OptionView.js				\
 	dc/StorageView.js				\
diff --git a/www/manager/Utils.js b/www/manager/Utils.js
index ff691fa0..e730c6b9 100644
--- a/www/manager/Utils.js
+++ b/www/manager/Utils.js
@@ -692,6 +692,8 @@ Ext.define('PVE.Utils', { statics: {
 	    return 'Sheepdog';
 	} else if (value === 'nexenta') {
 	    return 'Nexenta';
+	} else if (value === 'zfs') {
+	    return 'ZFS';
 	} else if (value === 'iscsidirect') {
 	    return 'iSCSIDirect';
 	} else {
diff --git a/www/manager/dc/StorageView.js b/www/manager/dc/StorageView.js
index e7e0ee40..be5f81a1 100644
--- a/www/manager/dc/StorageView.js
+++ b/www/manager/dc/StorageView.js
@@ -48,6 +48,8 @@ Ext.define('PVE.dc.StorageView', {
 		editor = 'PVE.storage.SheepdogEdit';
 	    } else if (type === 'nexenta') {
 		editor = 'PVE.storage.NexentaEdit';
+	    } else if (type === 'zfs') {
+		editor = 'PVE.storage.ZFSEdit';
 	    } else {
 		return;
 	    }
@@ -175,6 +177,15 @@ Ext.define('PVE.dc.StorageView', {
 				    win.show();
 				}
 			    },
+			    {
+				text: PVE.Utils.format_storage_type('ZFS'),
+				iconCls: 'pve-itype-icon-node',
+				handler: function() {
+				    var win = Ext.create('PVE.storage.ZFSEdit', {});
+				    win.on('destroy', reload);
+				    win.show();
+				}
+			    }
 */
 			]
 		    })
diff --git a/www/manager/qemu/Clone.js b/www/manager/qemu/Clone.js
index 87b4a988..5501a523 100644
--- a/www/manager/qemu/Clone.js
+++ b/www/manager/qemu/Clone.js
@@ -69,7 +69,8 @@ Ext.define('PVE.window.Clone', {
             rec.data.type === 'rbd' ||
             rec.data.type === 'iscsi' ||
             rec.data.type === 'sheepdog' ||
-            rec.data.type === 'nexenta'
+            rec.data.type === 'nexenta' ||
+			rec.data.type === 'zfs'
            ) {
             me.formatsel.setValue('raw');
             me.formatsel.setDisabled(true);
diff --git a/www/manager/qemu/HDEdit.js b/www/manager/qemu/HDEdit.js
index 311b67e7..fc9dae89 100644
--- a/www/manager/qemu/HDEdit.js
+++ b/www/manager/qemu/HDEdit.js
@@ -192,7 +192,8 @@ Ext.define('PVE.qemu.HDInputPanel', {
 			} else if (rec.data.type === 'lvm' || 
 				   rec.data.type === 'rbd' ||
 				   rec.data.type === 'sheepdog' ||
-				   rec.data.type === 'nexenta') {
+				   rec.data.type === 'nexenta' ||
+				   rec.data.type === 'zfs') {
 			    me.hdfilesel.setDisabled(true);
 			    me.hdfilesel.setVisible(false);
 			    me.formatsel.setValue('raw');