diff --git a/package/base-files/default/etc/init.d/S10boot b/package/base-files/default/etc/init.d/S10boot
index 9dd0beb1c..02fddee7b 100755
--- a/package/base-files/default/etc/init.d/S10boot
+++ b/package/base-files/default/etc/init.d/S10boot
@@ -11,11 +11,6 @@ HOSTNAME=$(nvram get wan_hostname)
 HOSTNAME=${HOSTNAME%%.*}
 echo ${HOSTNAME:=OpenWrt}>/proc/sys/kernel/hostname
 
-# automagically run firstboot
-[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
-	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
-}
-
 mkdir -p /var/run
 mkdir -p /var/log
 touch /var/log/wtmp
diff --git a/package/base-files/default/etc/preinit b/package/base-files/default/etc/preinit
index 88c8920c9..ac9039ca7 100755
--- a/package/base-files/default/etc/preinit
+++ b/package/base-files/default/etc/preinit
@@ -16,4 +16,9 @@ fi
 
 mount_root ${FAILSAFE:+failsafe}
 
+# automagically run firstboot
+[ -z "$FAILSAFE" -a -z "$(nvram get no_root_swap)" ] && {
+	{ mount|grep "on / type jffs2" 1>&-; } || firstboot
+}
+
 exec /sbin/init