diff --git a/build/gapps.sh b/build/gapps.sh
index 2b2eb63..06a2004 100755
--- a/build/gapps.sh
+++ b/build/gapps.sh
@@ -45,6 +45,7 @@ function create() {
     echo "Build directories are now ready" >> $GLOG
     echo "Getting prebuilts..."
     echo "Copying stuff" >> $GLOG
+    cp $TOP/toybox-$GARCH $OUT/$GARCH/toybox >> $GLOG
     cp -r $PREBUILT/* $OUT/$GARCH/system >> $GLOG
     cp -r $COMMON/* $OUT/$GARCH/system >> $GLOG
     echo "Generating addon.d script" >> $GLOG
diff --git a/build/meta/com/google/android/update-binary b/build/meta/com/google/android/update-binary
index df0c8fa..585e86c 100644
--- a/build/meta/com/google/android/update-binary
+++ b/build/meta/com/google/android/update-binary
@@ -25,6 +25,8 @@ cleanup() {
   ui_print "Cleaning up files"
   cd ../
   rm -rf system
+  rm -rf bin
+  rm toybox
 
   ui_print "Unmounting partitions"
   umount -l "$SYSTEM_MNT"
@@ -103,6 +105,24 @@ ui_print "**********************"
 ui_print "MindTheGapps installer"
 ui_print "**********************"
 
+ui_print "Extracting files"
+TMP=/tmp
+cd "$TMP"
+unzip -o "$ZIP"
+rm -rf META-INF
+
+ui_print "Setting up environment"
+TOYBOX="${TMP}/toybox"
+chmod +x "$TOYBOX"
+
+TOYS_PATH="${TMP}/bin"
+rm -rf "$TOYS_PATH";
+$TOYBOX install -d "$TOYS_PATH"
+for toy in $($TOYBOX); do
+  $TOYBOX ln -sf "$TOYBOX" "${TOYS_PATH}/${toy}"
+done
+PATH="${TOYS_PATH}:${PATH}"
+
 ui_print "Mounting partitions"
 
 # Ensure system is unmounted so mounting succeeds
@@ -182,10 +202,6 @@ if [ -n "$SYSTEM_EXT_BLOCK" ]; then
 fi
 STORAGE_BUFFER=10240
 
-ui_print "Extracting files"
-cd /tmp
-unzip -o "$ZIP"
-rm -rf META-INF
 cd system
 compute_apps_size
 
diff --git a/toybox-arm b/toybox-arm
new file mode 100644
index 0000000..48acf85
Binary files /dev/null and b/toybox-arm differ
diff --git a/toybox-arm64 b/toybox-arm64
new file mode 100644
index 0000000..384cb01
Binary files /dev/null and b/toybox-arm64 differ
diff --git a/toybox-x86 b/toybox-x86
new file mode 100644
index 0000000..9a99ac0
Binary files /dev/null and b/toybox-x86 differ