diff --git a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S01update b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S01update
deleted file mode 100755
index 84336a1..0000000
--- a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S01update
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-THIS=$(basename $0)
-
-case "$1" in
-    start)
-	for file in /mnt/FunKey-*.swu; do
-	    swupdate -v -i "${file}"
-	    if [ $? -ne 0 ]; then
-	        share start
-	       	mkdir -p /run/network
-	       	/sbin/ifup -a
-	       	exit 1
-	    fi
-	done
-	normal_mode
-	;;
-    stop)
-	;;
-    *)
-	echo "Usage: $0 {start|stop}" >&2
-	exit 1
-	;;
-esac
diff --git a/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery
new file mode 100755
index 0000000..9986d95
--- /dev/null
+++ b/Recovery/board/funkey/rootfs-overlay/etc/init.d/S60recovery
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+THIS=$(basename $0)
+
+source /usr/local/lib/utils
+
+case "$1" in
+    start)
+	keys=$(devmem 0x01c20500 16)
+	if [ "${keys}" != "0xF83F" ]; then
+
+	    # Automatic update requested
+	    updates=$(ls /mnt/FunKey-*.swu)
+	    if [ "x${updates}" = "x" ]; then
+		menu &
+		exit 1
+	    fi
+	    for file in ${updates} ; do
+		swupdate -i "${file}"
+		if [ $? -ne 0 ]; then
+	            menu &
+		    exit 1
+		fi
+	    done
+	    notif "^^^^^^^^      RESTARTING...^^^^^^^^"
+	    normal_mode
+	else
+
+	    # Manual Recovery mode following Fn + Start keypress during boot
+	    menu &
+	fi
+	;;
+    stop)
+	;;
+    *)
+	echo "Usage: $0 {start|stop}" >&2
+	exit 1
+	;;
+esac