diff --git a/fs/etc/profile.d/raspi-config.sh b/fs/etc/profile.d/raspi-config.sh
new file mode 100644
index 0000000..0206061
--- /dev/null
+++ b/fs/etc/profile.d/raspi-config.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Part of raspi-config http://github.com/asb/raspi-config
+#
+# See LICENSE file for copyright and license details
+
+# Should be installed to /etc/profile.d/raspi-config.sh to force raspi-config
+# to run at initial login
+
+# You may also want to set automatic login in /etc/inittab on tty1 by adding a
+# line such as:
+# 1:2345:respawn:/bin/login -f root tty1 </dev/tty1 >/dev/tty1 2>&1 # RPICFG_TO_DISABLE
+
+if [ $(id -u) -ne 0 ]; then
+    printf "\nNOTICE: the software on this Raspberry Pi has not been fully configured. Please run 'sudo raspi-config'\n\n"
+else
+    # Disable raspi-config at the first run.
+    # raspi-config
+    exec login -f pi
+fi