diff --git a/CHANGELOG b/CHANGELOG
index 07ed111..7653e77 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 ======================
 Version    Description
 
+1.2.17......Check if bastille_zfs_enable is actually set to NO before zfs disable.
 1.2.16......Disable zfs activation warnings if bastille_zfs_enable is set to NO.
 1.2.15......Minor code changes/improvements.
 1.2.14......Make sure bastille-prefix ends with bastille.
diff --git a/bastille-init b/bastille-init
old mode 100644
new mode 100755
index 1716eb6..857fea8
--- a/bastille-init
+++ b/bastille-init
@@ -1392,7 +1392,9 @@ rc_params()
 		if zfs list -H "${CWDIR}" | awk '{print $1}' | grep -qw "${DAFAULT_BASTILLE_PREFIX}"; then
 			zfs_support_error
 		else
-			zfs_support_disabled
+			if [ "${bastille_zfs_enable}" = "NO" ] || [ "${bastille_zfs_enable}" = "no" ]; then
+				zfs_support_disabled
+			fi
 		fi
 	fi
 
diff --git a/version b/version
index f69752a..b66183a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.2.16
+1.2.17