--- chroot/lib/live/boot/9990-misc-helpers.sh	2014-12-10 10:37:04.000000000 +0100
+++ chroot/lib/live/boot/9990-misc-helpers.sh	2015-02-16 11:14:26.970265812 +0100
@@ -1322,9 +1322,17 @@
 			pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true )
 			;;
 
-		overlayfs)
+		overlay)
 			# XXX: can multiple unionro be used? (overlayfs only handles two dirs, but perhaps they can be chained?)
+			# -overlayfs can be lowerdir
 			# XXX: and can unionro be optional? i.e. can overlayfs skip lowerdir?
+			# - it can be emty directory for sure.
+			# XXX: since overlayfs went official the name changed to just overlay. Also new requirement emerged - workdir.
+			# So either the overlayfs overlays get datadir and
+			# workdir and become incompatible with every other
+			# overlay without workdir or some special handling in
+			# persistence is needed.
+			mkdir -p "${unionrw}/data" "${unionrw}/work"
 			if echo ${unionro} | grep -q " "
 			then
 				panic "Multiple lower filesystems are currently not supported with overlayfs (unionro = ${unionro})."
@@ -1332,7 +1340,7 @@
 			then
 				panic "Overlayfs needs at least one lower filesystem (read-only branch)."
 			fi
-			unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}"
+			unionmountopts="-o noatime,lowerdir=${unionro},upperdir=${unionrw}/data,workdir=${unionrw}/work"
 			mount -t ${UNIONTYPE} ${unionmountopts} ${UNIONTYPE} "${unionmountpoint}"
 			;;
 
--- chroot/lib/live/boot/9990-overlay.sh	2014-12-10 10:37:04.000000000 +0100
+++ chroot/lib/live/boot/9990-overlay.sh	2015-02-16 10:42:00.830196987 +0100
@@ -9,7 +9,7 @@
 	addimage_directory="${3}"
 
 	case ${UNIONTYPE} in
-		aufs|unionfs|overlayfs)
+		aufs|unionfs|overlay)
 			modprobe -q -b ${UNIONTYPE}
 
 			if ! cut -f2 /proc/filesystems | grep -q "^${UNIONTYPE}\$" && [ -x /bin/unionfs-fuse ]