=== modified file 'src/utils/ecryptfs-setup-swap'
--- src/utils/ecryptfs-setup-swap	2015-02-10 18:14:12 +0000
+++ src/utils/ecryptfs-setup-swap	2015-03-11 15:09:36 +0000
@@ -150,8 +150,8 @@
 	info `gettext "Setting up swap:"` "[$swap]"
 	uuid=$(blkid -o value -s UUID $swap)
 	for target in "UUID=$uuid" $swap; do
-		if [ -n "$target" ] && grep -qs "^$target " /etc/fstab; then
-			sed -i "s:^$target :\#$target :" /etc/fstab
+		if [ -n "$target" ] && grep -qs "^$target\s\+" /etc/fstab; then
+			sed -i "s:^$target\s\+:\#$target :" /etc/fstab
 			warn "Commented out your unencrypted swap from /etc/fstab"
 		fi
 	done
@@ -163,7 +163,7 @@
 	# Add crypttab entry
 	# Use /dev/urandom, since this is not a long lived key (generated each boot),
 	# and so that we don't block booting while waiting for entropy
-	echo "cryptswap$i UUID=$uuid /dev/urandom swap,cipher=aes-cbc-essiv:sha256" >> /etc/crypttab
+	echo "cryptswap$i UUID=$uuid /dev/urandom swap,offset=1024,cipher=aes-xts-plain64" >> /etc/crypttab
 
 	# Add fstab entry
 	echo "/dev/mapper/cryptswap$i none swap sw 0 0" >> /etc/fstab