diff --git a/etc/ffs-check.sh b/etc/ffs-check.sh
new file mode 100644
index 0000000000..09fa6b511b
--- /dev/null
+++ b/etc/ffs-check.sh
@@ -0,0 +1,7 @@
+if [ -d "/dev/usb-ffs" ]; then
+   echo "/dev/usb-ffs directory found"
+   mkdir /dev/usb-ffs 0770 shell shell
+   mkdir /dev/usb-ffs/adb 0770 shell shell
+   mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
+   write /sys/class/android_usb/android0/f_ffs/aliases adb
+fi
diff --git a/etc/init.rc b/etc/init.rc
index e0889c44d5..684a58cd2e 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -48,10 +48,8 @@ on init
 
 on fs
     mount pstore pstore /sys/fs/pstore
-    mkdir /dev/usb-ffs 0770 shell shell
-    mkdir /dev/usb-ffs/adb 0770 shell shell
-    mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
-
+    exec ffs-check.sh
+    
 on boot
     ifup lo
     hostname localhost
diff --git a/etc/init.recovery.usb.rc b/etc/init.recovery.usb.rc
index 8ef20e0ec9..fa7c4effc2 100644
--- a/etc/init.recovery.usb.rc
+++ b/etc/init.recovery.usb.rc
@@ -2,7 +2,6 @@ on fs
     write /sys/class/android_usb/android0/enable 0
     write /sys/class/android_usb/android0/idVendor 18D1
     write /sys/class/android_usb/android0/idProduct D001
-    write /sys/class/android_usb/android0/f_ffs/aliases adb
     write /sys/class/android_usb/android0/functions adb
     write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
     write /sys/class/android_usb/android0/iProduct ${ro.product.model}