diff --git a/build/meta/com/google/android/update-binary b/build/meta/com/google/android/update-binary
index 693288a..20b525f 100644
--- a/build/meta/com/google/android/update-binary
+++ b/build/meta/com/google/android/update-binary
@@ -48,8 +48,9 @@ if [ "$SYSTEMASROOT" == "true" ]; then
     TARGETSYSTEM=/dev/block/bootdevice/by-name/system
   fi
   mkdir -p /system_root
-  if mount -o rw $TARGETSYSTEM /system_root && mount /system_root/system /system; then
+  if mount -o rw $TARGETSYSTEM /system_root; then
     ui_print "/system mounted"
+    SYSTEM=/system_root/system
   else
     ui_print "Could not mount /system! Aborting"
     exit 1
@@ -57,6 +58,7 @@ if [ "$SYSTEMASROOT" == "true" ]; then
 else
   if mount /system; then
     ui_print "/system mounted"
+    SYSTEM=/system
   else
     ui_print "Could not mount /system! Aborting"
     exit 1
@@ -128,9 +130,9 @@ for dirs in $DIRS; do
   done
 done
 ui_print "Copying files"
-exec_util "cp --preserve=a -r ./* /system/"
+exec_util "cp --preserve=a -r ./* $SYSTEM/"
 if [ -e priv-app/SetupWizard ] ; then
-    exec_util "rm -rf /system/priv-app/Provision/"
+    exec_util "rm -rf $SYSTEM/priv-app/Provision/"
 fi
 ui_print "Cleaning up files"
 cd ../