diff --git a/molecules/e17.common b/molecules/e17.common
index 2d20ef6..5885e7b 100644
--- a/molecules/e17.common
+++ b/molecules/e17.common
@@ -79,7 +79,6 @@ packages_to_add:
 	sys-auth/consolekit,
 	sys-block/parted,
 	sys-fs/ntfs3g,
-	sys-fs/zfs,
 	sys-power/cpufrequtils,
 	www-client/midori,
 	x11-drivers/ati-drivers,
diff --git a/molecules/forensicxfce.common b/molecules/forensicxfce.common
index b6b9976..b7f798f 100644
--- a/molecules/forensicxfce.common
+++ b/molecules/forensicxfce.common
@@ -110,8 +110,7 @@ packages_to_add:
         sys-apps/mlocate,
 	sys-apps/gnome-disk-utility,
         sys-block/gparted, 
-	sys-fs/extundelete,
-	sys-fs/zfs,
+	sys-fs/extundelete,	
         www-client/chromium,
         x11-libs/xcb-util-image,
         x11-libs/xcb-util-keysyms,
diff --git a/molecules/gnome.common b/molecules/gnome.common
index 8cebf59..5ee3562 100644
--- a/molecules/gnome.common
+++ b/molecules/gnome.common
@@ -154,7 +154,6 @@ packages_to_add:
 	sys-block/gparted,
 	sys-fs/dmraid,
 	sys-fs/ntfs3g,
-	sys-fs/zfs,
 	sys-power/acpid,
 	sys-power/cpufrequtils,
 	www-client/chromium,
diff --git a/molecules/kde.common b/molecules/kde.common
index 36e4bad..e2e0c9b 100644
--- a/molecules/kde.common
+++ b/molecules/kde.common
@@ -307,7 +307,6 @@ packages_to_add:
 	sys-block/partitionmanager,
 	sys-fs/dmraid,
 	sys-fs/ntfs3g,
-	sys-fs/zfs,
 	sys-power/acpid,
 	sys-power/cpufrequtils,
 	www-client/chromium,
diff --git a/molecules/lxde.common b/molecules/lxde.common
index ba77c70..b1c0c9d 100644
--- a/molecules/lxde.common
+++ b/molecules/lxde.common
@@ -79,7 +79,6 @@ packages_to_add:
 	sys-auth/consolekit,
 	sys-block/parted,
 	sys-fs/ntfs3g,
-	sys-fs/zfs,
 	sys-power/cpufrequtils,
 	www-client/midori,
 	x11-misc/magneto-gtk,
diff --git a/molecules/spinbase.common b/molecules/spinbase.common
index f720858..76fc930 100644
--- a/molecules/spinbase.common
+++ b/molecules/spinbase.common
@@ -113,9 +113,6 @@ paths_to_empty:
     /var/lib/entropy/logs,
     /var/cache/genkernel
 
-packages_to_add:
-	sys-fs/zfs
-
 # Make sure they don't end up into the ISO
 packages_to_remove:
 	app-i18n/man-pages-da,
diff --git a/molecules/xfce.common b/molecules/xfce.common
index c1d5a99..8fa7ea7 100644
--- a/molecules/xfce.common
+++ b/molecules/xfce.common
@@ -118,7 +118,6 @@ packages_to_add:
 	sys-block/gparted,
 	sys-block/parted,
 	sys-fs/ntfs3g,
-	sys-fs/zfs,
 	sys-power/cpufrequtils,
 	www-client/midori,
 	www-plugins/adobe-flash,