diff --git a/pentoo/pentoo-system/files/pentoo-zram.initd-r2 b/pentoo/pentoo-system/files/pentoo-zram.initd-r3
similarity index 71%
rename from pentoo/pentoo-system/files/pentoo-zram.initd-r2
rename to pentoo/pentoo-system/files/pentoo-zram.initd-r3
index c756ab467..82abc32bf 100644
--- a/pentoo/pentoo-system/files/pentoo-zram.initd-r2
+++ b/pentoo/pentoo-system/files/pentoo-zram.initd-r3
@@ -16,8 +16,17 @@ start() {
 	echo "${ZRAM_ABSOLUTE/\.??/}" > /sys/devices/virtual/block/zram0/disksize || RETVAL=$?
   eindent
   ebegin "Formatting swap"
-	mkswap /dev/zram0 > /dev/null || RETVAL=$?
-  eend ${RETVAL}
+	timeout -k 31 30 mkswap /dev/zram0 > /dev/null || RETVAL=$?
+  if [ "${RETVAL}" = "124" ]; then
+    cmdline="$(cat /proc/cmdline)"
+    if [ "${cmdline#*cdroot}" != "${cmdline}" ]; then
+      eend 124 "mkswap timed out, if you see this a lot \"rc-service del pentoo-zram\""
+    else
+      eend ${RETVAL} "mkswap timed out, no ZRAM available"
+    fi
+  else
+    eend ${RETVAL}
+  fi
   eoutdent
   if [ "${RETVAL}" = "0" ]; then
     ebegin "Activating ZRAM swap device"
diff --git a/pentoo/pentoo-system/pentoo-system-2018.1-r9.ebuild b/pentoo/pentoo-system/pentoo-system-2018.1-r10.ebuild
similarity index 99%
rename from pentoo/pentoo-system/pentoo-system-2018.1-r9.ebuild
rename to pentoo/pentoo-system/pentoo-system-2018.1-r10.ebuild
index 6512a65c9..ff77271ce 100644
--- a/pentoo/pentoo-system/pentoo-system-2018.1-r9.ebuild
+++ b/pentoo/pentoo-system/pentoo-system-2018.1-r10.ebuild
@@ -189,7 +189,7 @@ src_install() {
 
 	newinitd "${FILESDIR}"/pentoo-linux-symlinks.initd pentoo-linux-symlinks
 	newinitd "${FILESDIR}"/pentoo-powersave.initd pentoo-powersave
-	newinitd "${FILESDIR}"/pentoo-zram.initd-r2 pentoo-zram
+	newinitd "${FILESDIR}"/pentoo-zram.initd-r3 pentoo-zram
 	newconfd "${FILESDIR}"/pentoo-zram.confd pentoo-zram
 
 	dosym /var/lib/layman/pentoo/scripts/pentoo-updater.sh /usr/sbin/pentoo-updater