diff --git a/include/Utils.h b/include/Utils.h
index 573d1cda..b0a9fd09 100644
--- a/include/Utils.h
+++ b/include/Utils.h
@@ -91,10 +91,11 @@ enum FILESYSTEM
 	FS_LINUX_SWRAID    = 26,
 	FS_LINUX_SWSUSPEND = 27,
 	FS_REFS            = 28,
+	FS_ZFS             = 29,
 
 	// Partition space usage colours
-	FS_USED            = 29,
-	FS_UNUSED          = 30
+	FS_USED            = 30,
+	FS_UNUSED          = 31
 } ;
 
 enum SIZE_UNIT
diff --git a/src/GParted_Core.cc b/src/GParted_Core.cc
index 1679ac9b..be8d1739 100644
--- a/src/GParted_Core.cc
+++ b/src/GParted_Core.cc
@@ -1612,6 +1612,8 @@ FILESYSTEM GParted_Core::detect_filesystem( PedDevice * lp_device, PedPartition
 			return FS_LINUX_SWSUSPEND ;
 		else if ( fsname == "ReFS" )
 			return FS_REFS;
+		else if ( fsname == "zfs_member" )
+			return FS_ZFS;
 	}
 
 	// Fallback to GParted simple internal file system detection
diff --git a/src/Utils.cc b/src/Utils.cc
index b6996831..4f65f636 100644
--- a/src/Utils.cc
+++ b/src/Utils.cc
@@ -108,6 +108,7 @@ Glib::ustring Utils::get_color( FILESYSTEM filesystem )
 		case FS_LINUX_SWRAID   	: return "#5A4733" ;	// ~ dark brown
 		case FS_LINUX_SWSUSPEND	: return "#884631" ;	//red dark
 		case FS_REFS		: return "#1FC48D" ;	// ~ medium aquamarine
+		case FS_ZFS 		: return "#CC763D" ;	// ~ darker orange
 
 		default				: return "#000000" ;
 	}
@@ -283,6 +284,7 @@ Glib::ustring Utils::get_filesystem_string( FILESYSTEM filesystem )
 		case FS_LINUX_SWRAID	: return "linux-raid" ;
 		case FS_LINUX_SWSUSPEND	: return "linux-suspend" ;
 		case FS_REFS		: return "refs" ;
+		case FS_ZFS 		: return "zfs" ;
 
 		default			: return "" ;
 	}