diff --git a/board/common/post-build.sh b/board/common/post-build.sh
index fcda4e70..ef6b941a 100755
--- a/board/common/post-build.sh
+++ b/board/common/post-build.sh
@@ -15,3 +15,7 @@ rm "$TARGET_DIR/etc/os-release"
 } > "$TARGET_DIR/etc/os-release"
 
 echo "Infix by KernelKit $GIT_VERSION -- $(date +"%b %e %H:%M %Z %Y")" > "$TARGET_DIR/etc/version"
+
+# Allow pdmenu (setup) to be a login shell
+grep -qsE '^/usr/bin/pdmenu$$' "$TARGET_DIR/etc/shells" \
+        || echo "/usr/bin/pdmenu" >> "$TARGET_DIR/etc/shells"
diff --git a/board/common/rootfs/etc/finit.conf b/board/common/rootfs/etc/finit.conf
new file mode 100644
index 00000000..00d0af6b
--- /dev/null
+++ b/board/common/rootfs/etc/finit.conf
@@ -0,0 +1 @@
+set COLORTERM=yes
diff --git a/package/skeleton-init-finit/skeleton-init-finit.mk b/package/skeleton-init-finit/skeleton-init-finit.mk
index 62d174a3..cfe406b0 100644
--- a/package/skeleton-init-finit/skeleton-init-finit.mk
+++ b/package/skeleton-init-finit/skeleton-init-finit.mk
@@ -22,7 +22,7 @@ define SKELETON_INIT_FINIT_GETTY
 		if [ $(SYSTEM_GETTY_BAUDRATE) -eq 0 ]; then \
 			SYSTEM_GETTY_BAUDRATE=""; \
 		fi; \
-		echo "tty [12345789] $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_TERM) noclear"; \
+		echo "tty [12345789] $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_TERM) noclear passenv"; \
 	else \
 		echo "tty [12345789] /sbin/getty -L $(SYSTEM_GETTY_OPTIONS) $(SYSTEM_GETTY_BAUDRATE) $(SYSTEM_GETTY_PORT) $(SYSTEM_GETTY_TERM)"; \
 	fi