diff --git a/package/base/sysfiles/system.init b/package/base/sysfiles/system.init
index 2a6d8d6b0..6ec1d7e5e 100644
--- a/package/base/sysfiles/system.init
+++ b/package/base/sysfiles/system.init
@@ -97,8 +97,8 @@ dnl
     block_split(`Setting hostname to $(cat /etc/HOSTNAME).')
 	check(`hostname "$(cat /etc/HOSTNAME)"')
 dnl
-    block_split(`Refresh utmp, delete lock files and other stuff.')
-	rm -f /var/lock/* /var/lock/*/* /var/run/* 2> /dev/null
+    block_split(`Refresh utmp, delete lock and tmp files and other stuff.')
+	find /var/lock /var/run /tmp -mindepth 1 2> /dev/null | xargs rm -rf
 	rm -f /etc/nologin /nologin /fastboot ; touch /var/run/utmp
 	chmod 664 /var/run/utmp ; chown root.tty /var/run/utmp
 dnl