diff --git a/BUILD.gn b/BUILD.gn
index ff8ebb8..99e70ca 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -19,6 +19,7 @@
     ":cols",
     ":comm",
     ":cp",
+
     # ":cron",
     ":cut",
     ":date",
@@ -134,9 +135,9 @@
     ]
 
     deps = [
-      "//zircon/public/lib/fdio",
       "libutf",
       "libutil",
+      "//zircon/public/lib/fdio",
     ]
 
     configs += [ ":sbase_config" ]
@@ -164,6 +165,7 @@
 }
 sbase_util("cp") {
 }
+
 # sbase_util("cron") {}
 sbase_util("cut") {
 }
@@ -337,9 +339,7 @@
     "//zircon/public/lib/fdio",
   ]
 
-  libs = [
-    "zircon",
-  ]
+  libs = [ "zircon" ]
 
   configs += [ ":sbase_config" ]
 }
@@ -347,7 +347,6 @@
 
 package("sbase") {
   testonly = true
-  deprecated_system_image = true
 
   deps = [
     ":all",
@@ -355,306 +354,382 @@
 
   binaries = [
     {
+      shell = true
       name = "basename"
     },
 
     {
+      shell = true
       name = "cal"
     },
 
     {
+      shell = true
       name = "cat"
     },
 
     {
+      shell = true
       name = "cksum"
     },
 
     {
+      shell = true
       name = "cmp"
     },
 
     {
+      shell = true
       name = "cols"
     },
 
     {
+      shell = true
       name = "comm"
     },
 
     {
+      shell = true
       name = "cp"
     },
 
     {
+      shell = true
       name = "cut"
     },
 
     {
+      shell = true
       name = "date"
     },
 
     {
+      shell = true
       name = "dirname"
     },
 
     {
+      shell = true
       name = "du"
     },
 
     {
+      shell = true
       name = "echo"
     },
 
     {
+      shell = true
       name = "ed"
     },
 
     {
+      shell = true
       name = "env"
     },
 
     {
+      shell = true
       name = "expand"
     },
 
     {
+      shell = true
       name = "expr"
     },
 
     {
+      shell = true
       name = "false"
     },
 
     {
+      shell = true
       name = "find"
     },
 
     {
+      shell = true
       name = "fold"
     },
 
     {
+      shell = true
       name = "grep"
     },
 
     {
+      shell = true
       name = "head"
     },
 
     {
+      shell = true
       name = "hostname"
     },
 
     {
+      shell = true
       name = "join"
     },
 
     {
+      shell = true
       name = "link"
     },
 
     {
+      shell = true
       name = "ls"
     },
 
     {
+      shell = true
       name = "md5sum"
     },
 
     {
+      shell = true
       name = "mkdir"
     },
 
     {
+      shell = true
       name = "mktemp"
     },
 
     {
+      shell = true
       name = "mv"
     },
 
     {
+      shell = true
       name = "nl"
     },
 
     {
+      shell = true
       name = "od"
     },
 
     {
+      shell = true
       name = "paste"
     },
 
     {
+      shell = true
       name = "pathchk"
     },
 
     {
+      shell = true
       name = "printenv"
     },
 
     {
+      shell = true
       name = "printf"
     },
 
     {
+      shell = true
       name = "pwd"
     },
 
     {
+      shell = true
       name = "readlink"
     },
 
     {
+      shell = true
       name = "rev"
     },
 
     {
+      shell = true
       name = "rm"
     },
 
     {
+      shell = true
       name = "rmdir"
     },
 
     {
+      shell = true
       name = "sed"
     },
 
     {
+      shell = true
       name = "seq"
     },
 
     {
+      shell = true
       name = "sha1sum"
     },
 
     {
+      shell = true
       name = "sha224sum"
     },
 
     {
+      shell = true
       name = "sha256sum"
     },
 
     {
+      shell = true
       name = "sha384sum"
     },
 
     {
+      shell = true
       name = "sha512-224sum"
     },
 
     {
+      shell = true
       name = "sha512-256sum"
     },
 
     {
+      shell = true
       name = "sha512sum"
     },
 
     {
+      shell = true
       name = "sleep"
     },
 
     {
+      shell = true
       name = "sort"
     },
 
     {
+      shell = true
       name = "split"
     },
 
     {
+      shell = true
       name = "sponge"
     },
 
     {
+      shell = true
       name = "strings"
     },
 
     {
+      shell = true
       name = "sync"
     },
 
     {
+      shell = true
       name = "tail"
     },
 
     {
+      shell = true
       name = "tar"
     },
 
     {
+      shell = true
       name = "tee"
     },
 
     {
+      shell = true
       name = "test"
     },
 
     {
+      shell = true
       name = "tftp"
     },
 
     {
+      shell = true
       name = "touch"
     },
 
     {
+      shell = true
       name = "tr"
     },
 
     {
+      shell = true
       name = "true"
     },
 
     {
+      shell = true
       name = "tsort"
     },
 
     {
+      shell = true
       name = "tty"
     },
 
     {
+      shell = true
       name = "unexpand"
     },
 
     {
+      shell = true
       name = "uniq"
     },
 
     {
+      shell = true
       name = "unlink"
     },
 
     {
+      shell = true
       name = "uudecode"
     },
 
     {
+      shell = true
       name = "uuencode"
     },
 
     {
+      shell = true
       name = "wc"
     },
 
     {
+      shell = true
       name = "which"
     },
 
     {
+      shell = true
       name = "xargs"
     },
 
     {
+      shell = true
       name = "xinstall"
     },
 
     {
+      shell = true
       name = "yes"
     },
   ]