diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1-r6.ebuild b/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1-r7.ebuild
similarity index 100%
rename from project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1-r6.ebuild
rename to project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1-r7.ebuild
diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1.ebuild b/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1.ebuild
index ea9f4eb..89d874c 100644
--- a/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1.ebuild
+++ b/project-lakitu/chromeos-base/chromeos-init-systemd-dev/chromeos-init-systemd-dev-0.0.1.ebuild
@@ -13,7 +13,7 @@
 LICENSE="BSD-Google"
 SLOT="0"
 KEYWORDS="*"
-IUSE="+serial-getty"
+IUSE="+serial-getty -serial-getty-autologin"
 
 RDEPEND="${DEPEND}
 	sys-apps/systemd
@@ -37,4 +37,6 @@
 	systemd_newtmpfilesd "${FILESDIR}"/dev-image.tmpfiles dev-image.conf
 
 	use serial-getty && systemd_enable_service getty.target serial-getty@$(getty_console).service
+	use serial-getty-autologin && systemd_install_serviced \
+		"${FILESDIR}"/serial-getty.service.conf serial-getty@$(getty_console).service
 }
diff --git a/project-lakitu/chromeos-base/chromeos-init-systemd-dev/files/serial-getty.service.conf b/project-lakitu/chromeos-base/chromeos-init-systemd-dev/files/serial-getty.service.conf
new file mode 100644
index 0000000..a1472c5
--- /dev/null
+++ b/project-lakitu/chromeos-base/chromeos-init-systemd-dev/files/serial-getty.service.conf
@@ -0,0 +1,3 @@
+[Service]
+ExecStart=
+ExecStart=-/sbin/agetty --autologin root --keep-baud 115200,38400,9600 %I $TERM