diff --git a/base/busybox/busybox.SMBuild b/base/busybox/busybox.SMBuild
index 734e902..04ac50a 100755
--- a/base/busybox/busybox.SMBuild
+++ b/base/busybox/busybox.SMBuild
@@ -28,16 +28,18 @@ build() {
   install -Dm 755 busybox $pkg/bin/busybox
 
   cp LICENSE $pkgdocs/
+  
+  (
+    cd $pkg/bin
 
-  cd $pkg/bin
-
-  for f in ntpd passwd udhcpc udhcpd route ifconfig \
-    telnet telnetd tftp microcom netstat killall5 setfont \
-    loadkmap wall ipcalc iostat brctl arp \
-    su login init chpst sv svc runsv runsvdir halt reboot poweroff getty \
-    adduser addgroup deluser delgroup mdev rev;
-     do ln -s busybox "$f"; 
-     done
+    for f in ntpd passwd udhcpc udhcpd route ifconfig \
+      telnet telnetd tftp microcom netstat killall5 setfont \
+      loadkmap wall ipcalc iostat brctl arp \
+      su login init chpst sv svc runsv runsvdir halt reboot poweroff getty \
+      adduser addgroup deluser delgroup mdev rev;
+        do ln -s busybox "$f"; 
+       done
+  )
 
   install -Dm 755 $srcdir/udhcpc-script $pkg/etc/udhcpc-script
   install -Dm 755 $srcdir/dhclient $pkg/bin/dhclient
diff --git a/base/cpio/cpio.SMBuild b/base/cpio/cpio.SMBuild
index bb6d1b8..a7ec5d8 100755
--- a/base/cpio/cpio.SMBuild
+++ b/base/cpio/cpio.SMBuild
@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -fcommon" \
+  CFLAGS+=" -fcommon" \
   ./configure \
     --prefix="" 
 
diff --git a/base/curl/curl.SMBuild b/base/curl/curl.SMBuild
index 97666dc..fb82c14 100755
--- a/base/curl/curl.SMBuild
+++ b/base/curl/curl.SMBuild
@@ -27,8 +27,9 @@ build() {
 
   make
   make install DESTDIR=$pkg
-
-  ( cd docs/libcurl 
+  
+  (
+    cd docs/libcurl 
     make install-man3 DESTDIR=$pkg
     cd opts
     make install-man3 DESTDIR=$pkg
diff --git a/base/db/db.SMBuild b/base/db/db.SMBuild
index 4bdcb40..86e5b6b 100755
--- a/base/db/db.SMBuild
+++ b/base/db/db.SMBuild
@@ -43,8 +43,7 @@ build() {
   make
   make install DESTDIR=$pkg
 
-  cd .. 
-  cp LICENSE $pkgdocs/
+  cp ../LICENSE $pkgdocs/
 
   mkfinalpkg
 }
diff --git a/base/e2fsprogs/e2fsprogs.SMBuild b/base/e2fsprogs/e2fsprogs.SMBuild
index 655690c..cde3d10 100755
--- a/base/e2fsprogs/e2fsprogs.SMBuild
+++ b/base/e2fsprogs/e2fsprogs.SMBuild
@@ -21,7 +21,7 @@ build() {
   done
 
   ac_cv_path_mkdir="mkdir -p" \
-  CFLAGS="$CFLAGS -D_GNU_SOURCE -D__uint64_t=u_int64_t -fPIC" \
+  CFLAGS+=" -D__uint64_t=u_int64_t" \
   LDFLAGS="-L/lib -static" \
   ./configure \
     --prefix="" \
diff --git a/base/enchant/enchant.SMBuild b/base/enchant/enchant.SMBuild
index c0c1415..bfd1899 100755
--- a/base/enchant/enchant.SMBuild
+++ b/base/enchant/enchant.SMBuild
@@ -24,12 +24,14 @@ build() {
   make install DESTDIR=$pkg
 
   cp COPYING.LIB $pkgdocs/
-
-  cd $pkg
-  ( cd include ; ln -sfv enchant-2 enchant )
-  ( cd bin ; ln -sfv enchant-2 enchant )
-  ( cd lib ; ln -sfv libenchant-2.so libenchant.so )
-  ( cd lib/pkgconfig ; ln -sfv enchant-2.pc enchant.pc )
+  
+  (
+    cd $pkg
+    cd include ; ln -sfv enchant-2 enchant 
+    cd ../bin ; ln -sfv enchant-2 enchant 
+    cd ../lib ; ln -sfv libenchant-2.so libenchant.so 
+    cd ../lib/pkgconfig ; ln -sfv enchant-2.pc enchant.pc 
+  )
 
   mkfinalpkg
 }
diff --git a/base/exfat-utils/exfat-utils.SMBuild b/base/exfat-utils/exfat-utils.SMBuild
index e0df8b1..29b26e9 100755
--- a/base/exfat-utils/exfat-utils.SMBuild
+++ b/base/exfat-utils/exfat-utils.SMBuild
@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -std=c99" \
+  CFLAGS+=" -std=c99" \
   ./configure \
     --prefix="" \
     --sbindir=/bin 
diff --git a/base/exiv2/exiv2.SMBuild b/base/exiv2/exiv2.SMBuild
index 49a7b92..1d46f3a 100755
--- a/base/exiv2/exiv2.SMBuild
+++ b/base/exiv2/exiv2.SMBuild
@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
   cmake .. \
     -DCMAKE_INSTALL_PREFIX="" \
     -DCMAKE_INSTALL_LIBDIR=lib
diff --git a/base/fftw/fftw.SMBuild b/base/fftw/fftw.SMBuild
index 191a223..0fdbaca 100755
--- a/base/fftw/fftw.SMBuild
+++ b/base/fftw/fftw.SMBuild
@@ -32,10 +32,10 @@ build() {
   }
 
   defmakeopts() {
-  make 
-  make install DESTDIR=$pkg
-  make clean
-  unset liboptions
+    make 
+    make install DESTDIR=$pkg
+    make clean
+    unset liboptions
   }
 
   # Standard build
diff --git a/base/file/doinst.sh b/base/file/doinst.sh
index d9c7f04..7ba2515 100644
--- a/base/file/doinst.sh
+++ b/base/file/doinst.sh
@@ -1,5 +1,5 @@
 # Compile /etc/file/magic.mgc:
-chroot . /usr/bin/file --compile 1> /dev/null 2> /dev/null
+chroot . /bin/file --compile 1> /dev/null 2> /dev/null
 if [ -r magic.mgc ]; then
   mv magic.mgc etc/file
 fi
diff --git a/base/file/file.SMBuild b/base/file/file.SMBuild
index 47d44f1..72280e5 100755
--- a/base/file/file.SMBuild
+++ b/base/file/file.SMBuild
@@ -20,7 +20,7 @@ prepbuilddir() {
 
 build() {
   # linking against libseccomp causes weird "Bad system call" issues
-  CFLAGS="$CFLAGS --std=c99" \
+  CFLAGS+=" --std=c99" \
   ./configure \
     --prefix="" \
     --datadir=/etc \
@@ -29,7 +29,7 @@ build() {
 
   # Install the flat files
   # We'll regenerate /etc/file/magic.mgc in the doinst.sh
-  rm -rf $pkg/etc/file/magic.mgc
+  #rm $pkg/etc/file/magic.mgc
   mkdir -p $pkg/etc/file/magic
   cp -a magic/Magdir/* $pkg/etc/file/magic/
   chmod 0644 $pkg/etc/file/magic/* 
diff --git a/base/file/recompile_magic.mgc.sh b/base/file/recompile_magic.mgc.sh
index 2ae5ca3..eb8a460 100644
--- a/base/file/recompile_magic.mgc.sh
+++ b/base/file/recompile_magic.mgc.sh
@@ -10,5 +10,5 @@ if [ ! "$UID" = "0" ]; then
 fi
 
 cd /etc/file
-/usr/bin/file --compile
+/bin/file --compile
 
diff --git a/base/flac/flac.SMBuild b/base/flac/flac.SMBuild
index 5217899..327b85b 100755
--- a/base/flac/flac.SMBuild
+++ b/base/flac/flac.SMBuild
@@ -16,9 +16,16 @@ prepbuilddir() {
 }
 
 build() {
+
+  if [[ $arch == "aarch64" ]] ; then
+    sseopts="--disable-sse" 
+  else
+    sseopts="--enable-sse"
+  fi
+
   ./configure \
     --prefix="" \
-    --disable-sse 
+    $sseopts
 
   make
   make install DESTDIR=$pkg
diff --git a/base/flex/flex.SMBuild b/base/flex/flex.SMBuild
index b1f9a04..aaa1225 100755
--- a/base/flex/flex.SMBuild
+++ b/base/flex/flex.SMBuild
@@ -16,9 +16,6 @@ prepbuilddir() {
 }
 
 build() {
-  unset CPPFLAGS
-  printf "all:\n\ttrue\n\ninstall:\n\ttrue\n\n" > tests/Makefile.in
-
   CPPFLAGS="$CFLAGS -DSTDC_HEADERS" \
   ./configure \
     --prefix="" \
diff --git a/base/fmt/fmt.SMBuild b/base/fmt/fmt.SMBuild
index e2a7f3c..09d79ff 100755
--- a/base/fmt/fmt.SMBuild
+++ b/base/fmt/fmt.SMBuild
@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
   cmake .. \
     -DCMAKE_INSTALL_PREFIX="" \
     -DCMAKE_INSTALL_LIBDIR="/lib" \
diff --git a/base/gawk/gawk.SMBuild b/base/gawk/gawk.SMBuild
index 4d0f3ba..76ecf3e 100755
--- a/base/gawk/gawk.SMBuild
+++ b/base/gawk/gawk.SMBuild
@@ -16,7 +16,8 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -static" \
+  #CFLAGS+=" -static" \
+  LDFLAGS="-static" \
   ./configure \
     --prefix="" \
     --libexecdir=/lib \
diff --git a/base/glib/doinst.sh b/base/glib/doinst.sh
index a70665f..dbe0651 100644
--- a/base/glib/doinst.sh
+++ b/base/glib/doinst.sh
@@ -1,5 +1 @@
-
-if [ -x /usr/bin/update-mime-database ]; then
-  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
-fi
-
+[ -x /etc/rc.d/rc.gtk ] && /etc/rc.d/rc.gtk
diff --git a/base/glib/glib.SMBuild b/base/glib/glib.SMBuild
index 4a904c1..a9b6590 100755
--- a/base/glib/glib.SMBuild
+++ b/base/glib/glib.SMBuild
@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
 
   meson .. --prefix="/" \
      -Dman=false \
diff --git a/base/gpgme/gpgme.SMBuild b/base/gpgme/gpgme.SMBuild
index 6fb9e93..0076c50 100755
--- a/base/gpgme/gpgme.SMBuild
+++ b/base/gpgme/gpgme.SMBuild
@@ -17,7 +17,6 @@ prepbuilddir() {
 
 build() {
   # TODO: disable linking against qt5 
-  CXXFLAGS="$CXXFLAGS -mno-outline-atomics" \
   ./configure \
     --prefix="" \
     --disable-static \
diff --git a/base/grep/grep.SMBuild b/base/grep/grep.SMBuild
index c5db6e0..df2146b 100755
--- a/base/grep/grep.SMBuild
+++ b/base/grep/grep.SMBuild
@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -static" \
+  LDFLAGS="-static" \
   ./configure \
     --prefix="" \
     --bindir=/bin 
diff --git a/base/initfs/initfs.SMBuild b/base/initfs/initfs.SMBuild
index 38fab8a..3581a40 100755
--- a/base/initfs/initfs.SMBuild
+++ b/base/initfs/initfs.SMBuild
@@ -19,7 +19,6 @@ build() {
   mv initfs/* . 
   rmdir initfs
 
-  mkdir -p install
   chmod 1777 tmp
   chmod 0700 root
 
diff --git a/base/json-glib/json-glib.SMBuild b/base/json-glib/json-glib.SMBuild
index 136f6da..6d2c85a 100755
--- a/base/json-glib/json-glib.SMBuild
+++ b/base/json-glib/json-glib.SMBuild
@@ -15,7 +15,7 @@ prepbuilddir() {
 }
 
 build() {
-  mkdir smbuild && cd smbuild
+  mkdir -p smbuild && cd smbuild
   meson .. --prefix="/" \
      -Dintrospection=false
 
diff --git a/base/kmod/kmod.SMBuild b/base/kmod/kmod.SMBuild
index db514e1..c72e503 100755
--- a/base/kmod/kmod.SMBuild
+++ b/base/kmod/kmod.SMBuild
@@ -27,11 +27,13 @@ build() {
   make install DESTDIR=$pkg
 
   cp COPYING $pkgdocs/
-
-  cd $pkg/bin
-  for file in depmod insmod lsmod modinfo modprobe rmmod ; do 
-   ln -sf kmod $file
-  done
+  
+  (
+    cd $pkg/bin
+    for file in depmod insmod lsmod modinfo modprobe rmmod ; do 
+      ln -sf kmod $file
+    done
+  )
 
   mkfinalpkg
 }
diff --git a/base/libpcap/libpcap.SMBuild b/base/libpcap/libpcap.SMBuild
index ed4b36c..9222b2f 100755
--- a/base/libpcap/libpcap.SMBuild
+++ b/base/libpcap/libpcap.SMBuild
@@ -16,7 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS="$CFLAGS -D_BSD_SOURCE -DIPPROTO_HOPOPTS=0 -include limits.h" \
+  CFLAGS+=" -D_BSD_SOURCE -DIPPROTO_HOPOPTS=0 -include limits.h" \
   ac_cv_type_u_int64_t=yes \
   ./configure \
     --prefix="" \
diff --git a/base/llvm/llvm.SMBuild b/base/llvm/llvm.SMBuild
index 3e1f60f..4f5f2b6 100755
--- a/base/llvm/llvm.SMBuild
+++ b/base/llvm/llvm.SMBuild
@@ -36,17 +36,20 @@ prepbuilddir() {
     mv libunwind-$version.src libunwind
   )
 
-  mkdir -p build && cd build
-  mkdir -p include
+  (
+    mkdir -p smbuild && cd smbuild
+    mkdir -p include
 
-  cp -r ../projects/libunwind/include/mach-o include/
-  rm -r ../projects/libunwind
+    cp -r ../projects/libunwind/include/mach-o include/
+    rm -r ../projects/libunwind
+  )
 }
 
 build() {
   # We don't need our optimisations for small builds
   unset CFLAGS CXXFLAGS
 
+  cd smbuild
   cmake .. -G Ninja -Wno-dev \
     -DCMAKE_BUILD_TYPE=MinSizeRel \
     -DCMAKE_INSTALL_PREFIX="" \
diff --git a/base/mksh/mksh.SMBuild b/base/mksh/mksh.SMBuild
index b57098c..45e3705 100755
--- a/base/mksh/mksh.SMBuild
+++ b/base/mksh/mksh.SMBuild
@@ -18,7 +18,7 @@ prepbuilddir() {
 
 build() {
   chmod +x Build.sh
-  CFLAGS="-static -O3 -fPIC" ./Build.sh
+  CFLAGS+=" -static" ./Build.sh
 
   install -Dm 644 mksh.1 $pkg/share/man/man1/mksh.1
   install -Dm 755 mksh $pkg/bin/mksh
diff --git a/base/musl/musl.SMBuild b/base/musl/musl.SMBuild
index 513b500..54de963 100755
--- a/base/musl/musl.SMBuild
+++ b/base/musl/musl.SMBuild
@@ -24,18 +24,17 @@ build() {
   make install DESTDIR=$pkg
 
   # Some additional stuff from alpine 
-  mkdir -p $pkg/bin addons && cd addons
-
+  mkdir -p $pkg/bin 
   gcc -o $pkg/bin/getconf $srcdir/getconf.c 
   gcc -o $pkg/bin/getent $srcdir/getent.c
   gcc -o $pkg/bin/iconv $srcdir/iconv.c 
-  cd ..
 
-  ( cd $pkg/lib
-  # Remove the symlink, it'll break upgrades and make the system useless
-  rm ld-musl-$arch.so.1 
-  # Copy the libc.so as the $arch-specific file
-  cp libc.so ld-musl-$arch.so.1
+  ( 
+    cd $pkg/lib
+    # Remove the symlink, it'll break upgrades and make the system useless
+    rm ld-musl-$arch.so.1 
+    # Copy the libc.so as the $arch-specific file
+    cp libc.so ld-musl-$arch.so.1
   )
 
   cp COPYRIGHT $pkgdocs/
diff --git a/base/zstd/zstd.SMBuild b/base/zstd/zstd.SMBuild
index 87ad2f6..7633775 100755
--- a/base/zstd/zstd.SMBuild
+++ b/base/zstd/zstd.SMBuild
@@ -1,7 +1,8 @@
 app=zstd
-version=1.4.4
+version=1.5.2
 build=1sml
-homepage="http://zstd.net"
+homepage="https://github.com/facebook/zstd"
+download="https://github.com/facebook/zstd/releases/download/v$version/zstd-$version.tar.gz"
 desc="Real-time compression algorithm providing high compression ratios"
 requires="gcc-libs zlib xz lz4"
 
@@ -12,31 +13,28 @@ prepbuilddir() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version 
   fixbuilddirpermissions
-
-  applypatch  $srcdir/zstd.dont.link.pzstd.to.static.libzstd.a.diff
 }
 
 build() {
-  make 
-  make -C contrib/pzstd
+  mkdir -p smbuild && cd smbuild
+  cmake ../build/cmake \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX="" \
+    -DCMAKE_INSTALL_LIBDIR="lib" \
+    -DZSTD_ZLIB_SUPPORT=ON \
+    -DZSTD_LZMA_SUPPORT=ON \
+    -DZSTD_LZ4_SUPPORT=ON \
+    -DZSTD_BUILD_STATIC=OFF \
+    -DZSTD_PROGRAMS_LINK_SHARED=ON
 
-  make \
-    prefix="" \
-    libdir="/lib" \
-    mandir="/share/man" \
-    DESTDIR=$pkg install
+  make
+  make install DESTDIR="$pkg"
 
-  install -Dm 755 contrib/pzstd/pzstd $pkg/bin/pzstd
-
-  # zstdmt and zstd are the same, so symlink them
-  ( cd $pkg/bin ; ln -sf zstd zstdmt )
-
-  cp -a COPYING* LICENSE $pkgdocs/
+  cp ../LICENSE $pkgdocs/
 
   mkfinalpkg
 }
 
 sha512sums="
-1f15e07a051ba2ca066f6c0e2807fa309a2bd01c4994d9a0d12237c3371422316c69da92917d4729f84df82717fb97a0761001a94a9de9a2a538b9002c57fd63  zstd-1.4.4.tar.lz
-356a47ea676262c70d0a22c20aedc98a4d1070972ec8910b2bb063c35e32b9beadb09ecab51beab36df24fd678e8948ace3efe485af5208d635dcc7c02d22948  zstd.dont.link.pzstd.to.static.libzstd.a.diff
+7b7a6e3ca395eef68e40119f9168a0730d561b94b8fa5be9b3936ec7f86cad4b1333596604a260d3ab81d593de4bef9fad43d41eb9fe0d74e202173ef7f2728c  zstd-1.5.2.tar.lz
 "
diff --git a/base/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff b/base/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff
deleted file mode 100644
index 6ecc373..0000000
--- a/base/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./contrib/pzstd/Makefile.orig	2018-12-29 22:36:55.196425576 -0600
-+++ ./contrib/pzstd/Makefile	2018-12-29 22:37:54.123426836 -0600
-@@ -171,8 +171,8 @@
- 	$(TESTPROG) ./test/RoundTripTest$(EXT) $(TESTFLAGS)
- 
- # Build the main binary
--pzstd$(EXT): main.o $(PROGDIR)/util.o Options.o Pzstd.o SkippableFrame.o $(ZSTDDIR)/libzstd.a
--	$(LD_COMMAND)
-+pzstd$(EXT): main.o $(PROGDIR)/util.o Options.o Pzstd.o SkippableFrame.o
-+	$(LD_COMMAND) -L ../../lib -lzstd
- 
- # Target that depends on all the tests
- .PHONY: tests