diff --git a/pentoo/pentoo-livecd/files/livecd-setpass b/pentoo/pentoo-livecd/files/livecd-setpass
new file mode 100644
index 000000000..edf89d5cf
--- /dev/null
+++ b/pentoo/pentoo-livecd/files/livecd-setpass
@@ -0,0 +1,19 @@
+#!/bin/sh
+setpassword(){
+  printf "RFC 2119: MUST means an absolute requirement\n"
+  printf "You *MUST* set a password to continue. Do not forget your password.\n"
+  sudo passwd pentoo
+}
+
+changeuser="${USER}"
+
+if grep -q "${changeuser}:!" /etc/shadow; then
+  printf "For your security, Pentoo does not come with a default password.\n"
+  printf "To protect your session you must set a password now.\n"
+  printf "Do not forget your password.\n"
+  sudo passwd ${changeuser}
+fi
+
+while sudo grep -q "${changeuser}:!" /etc/shadow; do
+  setpassword
+done
diff --git a/pentoo/pentoo-livecd/pentoo-livecd-2016.3.ebuild b/pentoo/pentoo-livecd/pentoo-livecd-2016.3-r1.ebuild
similarity index 96%
rename from pentoo/pentoo-livecd/pentoo-livecd-2016.3.ebuild
rename to pentoo/pentoo-livecd/pentoo-livecd-2016.3-r1.ebuild
index 178752d5f..1b6cc3a8d 100644
--- a/pentoo/pentoo-livecd/pentoo-livecd-2016.3.ebuild
+++ b/pentoo/pentoo-livecd/pentoo-livecd-2016.3-r1.ebuild
@@ -41,4 +41,6 @@ src_install() {
 	doexe "${FILESDIR}"/networkmanager.desktop
 	exeinto /etc/skel/Desktop
 	newexe "${FILESDIR}"/sudo-networkmanager.desktop networkmanager.desktop
+
+	dosbin "${FILESDIR}"/livecd-setpass
 }