diff --git a/base/.buildlist.base b/base/.buildlist.base
index b46eb03..d00f074 100644
--- a/base/.buildlist.base
+++ b/base/.buildlist.base
@@ -156,7 +156,8 @@ libtheora
 physfs
 brotli
 hyphen
-fuse
+fuse2
+fuse3
 gnutls
 libsndfile
 libtorrent
@@ -321,5 +322,4 @@ fmt
 argon2
 qrencode
 libqalculate
-fuse3
 protobuf
diff --git a/base/acpid/acpid.SMBuild b/base/acpid/acpid.SMBuild
index 8909508..84781a9 100755
--- a/base/acpid/acpid.SMBuild
+++ b/base/acpid/acpid.SMBuild
@@ -1,6 +1,6 @@
 app=acpid
 version=2.0.32
-build=1sml
+build=2sml
 homepage="https://sourceforge.net/projects/acpid2"
 download=""
 desc="Tools and daemon for implementing ACPI standard on Linux"
@@ -30,7 +30,6 @@ build() {
   install -Dm 755 $srcdir/rc.acpid $pkg/etc/rc.d/rc.acpid
 
   cp COPYING $pkgdocs/
-  head -n 100 Changelog > $pkgdocs/CHANGELOG
 
   mkfinalpkg
 }
diff --git a/base/attr/attr-cdefs.patch b/base/attr/attr-cdefs.patch
deleted file mode 100644
index 8bf2990..0000000
--- a/base/attr/attr-cdefs.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- attr-2.4.47.org/include/xattr.h
-+++ attr-2.4.47/include/xattr.h
-@@ -30,8 +30,13 @@
- #define XATTR_CREATE  0x1       /* set value, fail if attr already exists */
- #define XATTR_REPLACE 0x2       /* set value, fail if attr does not exist */
- 
-+#ifndef __THROW
-+#define __THROW
-+#endif
- 
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
- extern int setxattr (const char *__path, const char *__name,
- 		      const void *__value, size_t __size, int __flags) __THROW;
-@@ -58,6 +63,8 @@
- extern int lremovexattr (const char *__path, const char *__name) __THROW;
- extern int fremovexattr (int __filedes,   const char *__name) __THROW;
- 
--__END_DECLS
-+#ifdef __cplusplus
-+}
-+#endif
- 
- #endif	/* __XATTR_H__ */
diff --git a/base/attr/attr.SMBuild b/base/attr/attr.SMBuild
index b6e8760..f80c161 100755
--- a/base/attr/attr.SMBuild
+++ b/base/attr/attr.SMBuild
@@ -1,8 +1,8 @@
 app=attr
-version=2.4.47
+version=2.5.1
 build=1sml
 homepage="https://savannah.nongnu.org/projects/attr"
-download="https://download.savannah.nongnu.org/releases/attr/attr-$version.src.tar.gz"
+download="http://download.savannah.nongnu.org/releases/attr/attr-$version.tar.xz"
 requires="musl"
 desc="Tools for manipulating extended attributes on filesystems"
 
@@ -13,33 +13,21 @@ prepbuilddir() {
   tar xf $srcdir/$app-$version.tar.?z*
   cd $app-$version
   fixbuilddirpermissions
-
-  sed -i 's@-o $(PKG_USER) -g $(PKG_GROUP)@@' include/buildmacros
-  sed -i 's@CHOWN=_chown@CHOWN=true@' include/install-sh
-  applypatch $srcdir/attr-cdefs.patch
-  make clean
 }
 
 build() {
-  CFLAGS="-static" \
   ./configure \
     --prefix="" \
-    --enable-gettext=no 
+    --docdir="/share/doc/$app-$version" \
+    --disable-static \
+    --disable-nls
 
-  for i in po ; do
-     printf 'all:\n\ttrue\ninstall:\n\ttrue\ninstall-lib:\n\ttrue\ninstall-dev:\n\ttrue\nclean:\n\ttrue\n' > "$i"/Makefile
-  done
-
-  make LDFLAGS=-all-static
-
-  make DESTDIR="$pkg" install install-lib install-dev
-
-  cp doc/{COPYING,COPYING.LGPL} $pkgdocs/
+  make
+  make install DESTDIR="$pkg"
 
   mkfinalpkg
 }
 
 sha512sums="
-8d1c8b506db2e0c8290d49dc2672a59d7fb5a8e74e784835132d706ebd0c52a14d848fde8fe629c551b51bdc098152f0e5ee0290d0ef51dd5f90dca3c113d24b  attr-2.4.47.tar.lz
-28236fb6bd7021d249bb2f4fc98a4445f86d336afd4289708b3580d126f08c0c952595f78aa14b203f857df06e5c7262348b660c0e206de3efb1caecf6d19f8c  attr-cdefs.patch
-"
+d42787fedef0784c519931e9158dfb9fd51fedf5f1f59c7ea5c0877f6b4082abb9150a8e15dc02c467fd1ee2ef39c5c20c6b4c4d14dc7b3b47f6c2f9e637ad7e  attr-2.5.1.tar.lz
+"
\ No newline at end of file
diff --git a/base/coreutils/coreutils.SMBuild b/base/coreutils/coreutils.SMBuild
index b4c16c9..99ac475 100755
--- a/base/coreutils/coreutils.SMBuild
+++ b/base/coreutils/coreutils.SMBuild
@@ -1,6 +1,6 @@
 app=coreutils
 version=8.32
-build=1sml
+build=2sml
 homepage="https://www.gnu.org/software/coreutils/coreutils.html"
 download="http://ftp.gnu.org/gnu/coreutils/coreutils-$version.tar.xz"
 desc="Core GNU utilities"
@@ -19,7 +19,7 @@ prepbuilddir() {
 
 build() {
   FORCE_UNSAFE_CONFIGURE=1 \
-  CFLAGS="$CFLAGS -static" \
+  LDFLAGS="-static" \
   ./configure \
     --prefix="" \
     --bindir=/bin \
diff --git a/base/curl/curl.SMBuild b/base/curl/curl.SMBuild
index fb82c14..538b737 100755
--- a/base/curl/curl.SMBuild
+++ b/base/curl/curl.SMBuild
@@ -38,8 +38,6 @@ build() {
   # We don't ship the related perl script (yet):
   rm -f $pkg/share/man/man1/mk-ca-bundle.1
 
-  strip -g $pkg/lib/libcurl.a
-
   cp COPYING $pkgdocs/
 
   mkfinalpkg
diff --git a/base/e2fsprogs/e2fsprogs.SMBuild b/base/e2fsprogs/e2fsprogs.SMBuild
index cde3d10..0e301c1 100755
--- a/base/e2fsprogs/e2fsprogs.SMBuild
+++ b/base/e2fsprogs/e2fsprogs.SMBuild
@@ -1,6 +1,6 @@
 app=e2fsprogs
 version=1.45.3
-build=2sml
+build=3sml
 homepage="http://e2fsprogs.sourceforge.net/"
 download="https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$version/e2fsprogs-$version.tar.xz"
 desc="Utilities for working with ext 2, 3 and 4 filesystems"
@@ -22,7 +22,7 @@ build() {
 
   ac_cv_path_mkdir="mkdir -p" \
   CFLAGS+=" -D__uint64_t=u_int64_t" \
-  LDFLAGS="-L/lib -static" \
+  LDFLAGS="-static" \
   ./configure \
     --prefix="" \
     --with-root-prefix="" \
@@ -30,11 +30,10 @@ build() {
     --disable-nls \
     --disable-libblkid \
     --disable-libuuid \
-    --disable-uuidd 
+    --disable-uuidd
 
   make
   make install DESTDIR=$pkg
-  make DESTDIR=$pkg install-libs
 
   cp NOTICE $pkgdocs/LICENSE
 
diff --git a/base/file/file.SMBuild b/base/file/file.SMBuild
index 72280e5..4b014c5 100755
--- a/base/file/file.SMBuild
+++ b/base/file/file.SMBuild
@@ -1,6 +1,6 @@
 app=file
 version=5.39
-build=3sml
+build=4sml
 homepage="https://www.darwinsys.com/file/"
 download="http://astron.com/pub/file/file-$version.tar.gz"
 desc="Utility to determine file types"
@@ -27,6 +27,9 @@ build() {
     --enable-fsect-man5 \
     --disable-libseccomp
 
+  make
+  make install DESTDIR=$pkg
+
   # Install the flat files
   # We'll regenerate /etc/file/magic.mgc in the doinst.sh
   #rm $pkg/etc/file/magic.mgc
@@ -36,13 +39,10 @@ build() {
 
   install -Dm 755 $srcdir/recompile_magic.mgc.sh $pkg/etc/file/recompile_magic.mgc.sh
 
-  ( cd $pkg/etc ; ln -sf file misc )
-
-  make
-  make install DESTDIR=$pkg
-
   cp COPYING $pkgdocs/
 
+  ( cd $pkg/etc ; ln -sf file misc )
+
   mkfinalpkg
 }
 
diff --git a/base/fmt/fmt.SMBuild b/base/fmt/fmt.SMBuild
index 09d79ff..f8c90a5 100755
--- a/base/fmt/fmt.SMBuild
+++ b/base/fmt/fmt.SMBuild
@@ -1,6 +1,6 @@
 app=fmt
 version=8.1.0
-build=1sml
+build=2sml
 homepage="https://github.com/fmtlib/fmt"
 download="https://github.com/fmtlib/fmt/archive/refs/tags/$version.tar.gz"
 desc="Formatting library for C++"
@@ -22,6 +22,7 @@ build() {
     -DCMAKE_INSTALL_LIBDIR="/lib" \
     -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
     -DBUILD_SHARED_LIBS=ON \
+    -DFMT_TEST=OFF \
     -Wno-dev
 
   make
diff --git a/base/fuse/doinst.sh b/base/fuse2/doinst.sh
similarity index 62%
rename from base/fuse/doinst.sh
rename to base/fuse2/doinst.sh
index cbb9562..e3d5d18 100644
--- a/base/fuse/doinst.sh
+++ b/base/fuse2/doinst.sh
@@ -14,11 +14,11 @@ config() {
 }
 
 # Keep same perms on rc.fuse.new:
-if [ -e etc/rc.d/rc.fuse ]; then
-  cp -a etc/rc.d/rc.fuse etc/rc.d/rc.fuse.new.incoming
-  cat etc/rc.d/rc.fuse.new > etc/rc.d/rc.fuse.new.incoming
-  mv etc/rc.d/rc.fuse.new.incoming etc/rc.d/rc.fuse.new
+if [ -e etc/rc.d/rc.fuse2 ]; then
+  cp -a etc/rc.d/rc.fuse2 etc/rc.d/rc.fuse2.new.incoming
+  cat etc/rc.d/rc.fuse2.new > etc/rc.d/rc.fuse2.new.incoming
+  mv etc/rc.d/rc.fuse2.new.incoming etc/rc.d/rc.fuse2.new
 fi
 
-config etc/rc.d/rc.fuse.new
+config etc/rc.d/rc.fuse2.new
 
diff --git a/base/fuse/fuse.SMBuild b/base/fuse2/fuse2.SMBuild
similarity index 73%
rename from base/fuse/fuse.SMBuild
rename to base/fuse2/fuse2.SMBuild
index 26636df..a18c92a 100755
--- a/base/fuse/fuse.SMBuild
+++ b/base/fuse2/fuse2.SMBuild
@@ -1,6 +1,6 @@
-app=fuse
+app=fuse2
 version=2.9.5
-build=1sml
+build=2sml
 homepage="https://github.com/libfuse/libfuse"
 download="https://github.com/libfuse/libfuse/releases/download/fuse-$version/fuse-$version.tar.xz"
 desc="Interface to export virtual filesystem in userspace"
@@ -8,14 +8,16 @@ requires="musl"
 
 prepbuilddir() {
   mkandenterbuilddir
-  rm -rf $app-$version
+  rm -rf fuse-$version
 
-  tar xf $srcdir/$app-$version.tar.?z*
-  cd $app-$version
+  tar xf $srcdir/fuse-$version.tar.?z*
+  cd fuse-$version
   fixbuilddirpermissions
 }
 
 build() {
+  INIT_D_PATH="/etc/rc.d" \
+  MOUNT_FUSE_PATH="/bin" \
   ./configure \
     --prefix="" \
     --sysconfdir=/etc \
@@ -27,11 +29,8 @@ build() {
   make
   make install DESTDIR=$pkg
 
-  mv $pkg/sbin/* $pkg/bin/ ; rmdir $pkg/sbin
-
-  mkdir -p $pkg/etc/rc.d
-  mv $pkg/etc/init.d/fuse $pkg/etc/rc.d/rc.fuse.new
-  rm -rf $pkg/etc/init.d
+  rm -rv $pkg/dev
+  mv $pkg/etc/rc.d/fuse $pkg/etc/rc.d/rc.fuse2.new
 
   cp COPYING* $pkgdocs/
 
diff --git a/base/fuse3/doinst.sh b/base/fuse3/doinst.sh
index 0369602..6a589fa 100644
--- a/base/fuse3/doinst.sh
+++ b/base/fuse3/doinst.sh
@@ -20,5 +20,4 @@ if [ -e etc/rc.d/rc.fuse3 ]; then
   mv etc/rc.d/rc.fuse3.new.incoming etc/rc.d/rc.fuse3.new
 fi
 
-config etc/rc.d/rc.fuse3.new
-config etc/fuse.conf.new
+config etc/rc.d/rc.fuse.new
diff --git a/base/fuse3/fuse3.SMBuild b/base/fuse3/fuse3.SMBuild
index 160e32a..255c3fd 100755
--- a/base/fuse3/fuse3.SMBuild
+++ b/base/fuse3/fuse3.SMBuild
@@ -17,6 +17,7 @@ prepbuilddir() {
 
 build() {
   mkdir -p smbuild && cd smbuild
+  sed -i 's@/etc/init.d/fuse3@/etc/rc.d/rc.fuse.new@g' ../util/install_helper.sh
   meson .. \
     --prefix="/" \
     --sbindir=bin \
@@ -25,11 +26,10 @@ build() {
   ninja
   DESTDIR="$pkg" ninja install
 
-  # We don't need the fuse init script
-  rm -rf $pkg/etc/init.d
-
   cp ../LICENSE $pkgdocs
 
+  rm -rv $pkg/dev
+
   mkfinalpkg
 }
 
diff --git a/base/gmp/gmp.SMBuild b/base/gmp/gmp.SMBuild
index 574d86c..bacf29a 100755
--- a/base/gmp/gmp.SMBuild
+++ b/base/gmp/gmp.SMBuild
@@ -19,7 +19,8 @@ build() {
   ./configure \
     --prefix="" \
     --with-pic \
-    --enable-cxx 
+    --enable-cxx \
+    --disable-static
   
   make
   make install DESTDIR=$pkg
diff --git a/base/gpgme/gpgme.SMBuild b/base/gpgme/gpgme.SMBuild
index 0076c50..4e5163f 100755
--- a/base/gpgme/gpgme.SMBuild
+++ b/base/gpgme/gpgme.SMBuild
@@ -1,6 +1,6 @@
 app=gpgme
 version=1.13.1
-build=1sml
+build=2sml
 homepage="https://gnupg.org/software/gpgme/index.html"
 download="https://gnupg.org/ftp/gcrypt/gpgme/gpgme-$version.tar.bz2"
 desc="C language library to easily add crypto to a program"
@@ -20,7 +20,8 @@ build() {
   ./configure \
     --prefix="" \
     --disable-static \
-    --disable-gpg-test
+    --disable-gpg-test \
+    --enable-languages="cl cpp"
 
   make
   make install DESTDIR=$pkg 
diff --git a/base/tree/tree.SMBuild b/base/tree/tree.SMBuild
index f42374e..d18e0ba 100755
--- a/base/tree/tree.SMBuild
+++ b/base/tree/tree.SMBuild
@@ -1,6 +1,6 @@
 app=tree
 version=1.6.0
-build=1sml
+build=2sml
 homepage="http://mama.indstate.edu/users/ice/tree/"
 download="http://mama.indstate.edu/users/ice/tree/src/tree-$version.tgz"
 desc="Program to display a directory tree"
@@ -16,10 +16,7 @@ prepbuilddir() {
 }
 
 build() {
-  make
-
-  install -Dm 755 tree $pkg/bin/tree
-  install -Dm 644 doc/tree.1 $pkg/share/man/man1/tree.1
+  make install prefix="$pkg" MANDIR="$pkg/share/man/man1"
 
   cp LICENSE $pkgdocs/
 
diff --git a/base/zip/zip.SMBuild b/base/zip/zip.SMBuild
index 6a578b1..e60e181 100755
--- a/base/zip/zip.SMBuild
+++ b/base/zip/zip.SMBuild
@@ -1,6 +1,6 @@
 app=zip
 version=30
-build=1sml
+build=2sml
 homepage="http://www.info-zip.org/Zip.html"
 download="https://downloads.sourceforge.net/infozip/zip$version.tar.gz"
 desc="Compression and file packaging utility"
@@ -17,12 +17,9 @@ prepbuilddir() {
 
 build() {
   make -f unix/Makefile generic_gcc \
-  CFLAGS="$CFLAGS" 
+  CFLAGS="$CFLAGS"
 
-  make prefix="$pkg" -f unix/Makefile install
-  mkdir -p $pkg/share/man
-  mv $pkg/man/man* $pkg/share/man/
-  rmdir $pkg/man
+  make prefix="$pkg" -f unix/Makefile install MANDIR="$pkg/share/man/man1"
 
   cp LICENSE $pkgdocs/