diff --git a/build/cunit/build.sh b/build/cunit/build.sh
index 9892c9a73..af35a6644 100755
--- a/build/cunit/build.sh
+++ b/build/cunit/build.sh
@@ -12,7 +12,7 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -21,7 +21,9 @@ VER=2.1-3
 VERHUMAN=$VER
 PKG=ooce/developer/cunit
 SUMMARY="C Unit Testing Framework"
-DESC="$SUMMARY"
+DESC="$PROG - $SUMMARY"
+
+test_relver '>=' 151053 && set_clangver
 
 BUILDDIR=CUnit-$VER
 
@@ -40,8 +42,7 @@ prep_build
 patch_source
 run_autoreconf -fi
 build
-VER=${VER//-/.}
-make_package
+VER=${VER//-/.} make_package
 clean_up
 
 # Vim hints
diff --git a/build/cunit/files/ctf.ignore b/build/cunit/files/ctf.ignore
new file mode 100644
index 000000000..f6e2b38c8
--- /dev/null
+++ b/build/cunit/files/ctf.ignore
@@ -0,0 +1 @@
+MyMem.c
diff --git a/build/cunit/local.mog b/build/cunit/local.mog
index c5c4d4722..2acda8b81 100644
--- a/build/cunit/local.mog
+++ b/build/cunit/local.mog
@@ -8,10 +8,11 @@
 # source. A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 license COPYING license=LGPLv2
 
 <transform file path=$(PREFIX)/\. -> drop>
+<transform file path=$(OPREFIX)/doc -> drop>
 <transform file path=.*\.sh$ -> drop>
 
diff --git a/build/libdwarf/build.sh b/build/libdwarf/build.sh
index 2e1f37083..a734298b7 100755
--- a/build/libdwarf/build.sh
+++ b/build/libdwarf/build.sh
@@ -12,7 +12,7 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2021 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -40,7 +40,7 @@ init
 download_source $PROG $PROG $VER
 prep_build
 patch_source
-build -ctf
+build
 make_package
 clean_up
 
diff --git a/build/libdwarf/local.mog b/build/libdwarf/local.mog
index 431cd9060..478c847ad 100644
--- a/build/libdwarf/local.mog
+++ b/build/libdwarf/local.mog
@@ -8,13 +8,13 @@
 # source. A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
-# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 <transform path=$(PREFIX)/share/libdwarf -> drop>
 
 license dwarfdump/GPL.txt license=GPLv2
 license libdwarf/LGPL.txt license=LGPLv2.1
 license dwarfdump/DWARFDUMPCOPYRIGHT license=dwarfdump
-license libdwarf/LIBDWARFCOPYRIGHT license=libdwarf
+license libdwarf/LIBDWARFCOPYRIGHT license=libdwarfcopy
 license COPYING license=libdwarf
 
diff --git a/build/libmcrypt/build.sh b/build/libmcrypt/build.sh
index 4d8fd1fb0..d217ca13d 100755
--- a/build/libmcrypt/build.sh
+++ b/build/libmcrypt/build.sh
@@ -33,6 +33,18 @@ XFORM_ARGS="
 CONFIGURE_OPTS+="
     --mandir=$PREFIX/share/man
 "
+
+pre_configure() {
+    typeset arch=$1
+
+    ! cross_arch $arch && return
+
+    CONFIGURE_OPTS[$arch]+="
+        ac_cv_func_malloc_0_nonnull=yes
+        ac_cv_func_realloc_0_nonnull=yes
+    "
+}
+
 LDFLAGS[i386]+=" -lssp_ns"
 
 init
diff --git a/build/mosh/build.sh b/build/mosh/build.sh
index 79c67a166..def40a475 100755
--- a/build/mosh/build.sh
+++ b/build/mosh/build.sh
@@ -12,7 +12,7 @@
 # http://www.illumos.org/license/CDDL.
 # }}}
 
-# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -25,6 +25,7 @@ DESC="Remote terminal application that allows roaming"
 set_arch 64
 
 CXXFLAGS[amd64]+=" -std=c++17"
+CXXFLAGS[aarch64]+=" -std=c++17"
 
 init
 download_source $PROG $PROG $VER
diff --git a/build/protobuf/build.sh b/build/protobuf/build.sh
index 563153ef5..ff233caef 100755
--- a/build/protobuf/build.sh
+++ b/build/protobuf/build.sh
@@ -31,8 +31,18 @@ CONFIGURE_OPTS="
     -DCMAKE_POSITION_INDEPENDENT_CODE=ON
     -Dprotobuf_BUILD_TESTS=OFF
 "
-CONFIGURE_OPTS[i386]="-DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[i386]}"
-CONFIGURE_OPTS[amd64]="-DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[amd64]}"
+
+pre_configure() {
+    typeset arch=$1
+
+    CONFIGURE_OPTS[$arch]="
+        -DCMAKE_INSTALL_LIBDIR=$PREFIX/${LIBDIRS[$arch]}
+        -DZLIB_INCLUDE_DIR=${SYSROOT[$arch]}/usr/include
+        -DZLIB_LIBRARY_RELEASE=${SYSROOT[$arch]}/usr/${LIBDIRS[$arch]}/libz.so
+    "
+}
+
+CXXFLAGS[aarch64]+=" -mtls-dialect=trad"
 
 init
 clone_github_source $PROG "$GITHUB/protocolbuffers/$PROG" v$VER
diff --git a/build/rlwrap/build.sh b/build/rlwrap/build.sh
index 25a349327..f96f41ab6 100755
--- a/build/rlwrap/build.sh
+++ b/build/rlwrap/build.sh
@@ -13,7 +13,7 @@
 # }}}
 
 # Copyright 2022 r7st r7st.guru@gmail.com
-# Copyright 2023 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/build.sh
 
@@ -26,6 +26,12 @@ DESC+="Readline library to allow the editing of keyboard input for any command."
 
 set_arch 64
 
+pre_configure() {
+    typeset arch=$1
+
+    CPPFLAGS[$arch]+=" -I${SYSROOT[$arch]}/usr/include"
+}
+
 init
 download_source $PROG $PROG $VER
 patch_source
diff --git a/doc/baseline.aarch64 b/doc/baseline.aarch64
index 783e2e7d6..5f5887249 100644
--- a/doc/baseline.aarch64
+++ b/doc/baseline.aarch64
@@ -1,6 +1,7 @@
 extra.omnios ooce/application/links
 extra.omnios ooce/application/mc
 extra.omnios ooce/application/mutt
+extra.omnios ooce/application/tig
 extra.omnios ooce/audio/flac
 extra.omnios ooce/compress/pbzip2
 extra.omnios ooce/compress/pigz
@@ -11,8 +12,10 @@ extra.omnios ooce/database/mariadb-common
 extra.omnios ooce/database/postgresql-14
 extra.omnios ooce/database/postgresql-common
 extra.omnios ooce/developer/cmake
+extra.omnios ooce/developer/cunit
 extra.omnios ooce/developer/git-absorb
 extra.omnios ooce/developer/ninja
+extra.omnios ooce/developer/protobuf
 extra.omnios ooce/editor/joe
 extra.omnios ooce/file/tree
 extra.omnios ooce/fonts/liberation
@@ -27,6 +30,7 @@ extra.omnios ooce/library/json-c
 extra.omnios ooce/library/ldns
 extra.omnios ooce/library/libarchive
 extra.omnios ooce/library/libde265
+extra.omnios ooce/library/libdwarf
 extra.omnios ooce/library/libev
 extra.omnios ooce/library/libexif
 extra.omnios ooce/library/libgd
@@ -34,6 +38,7 @@ extra.omnios ooce/library/libgif
 extra.omnios ooce/library/libheif
 extra.omnios ooce/library/libid3tag
 extra.omnios ooce/library/libjpeg-turbo
+extra.omnios ooce/library/libmcrypt
 extra.omnios ooce/library/libogg
 extra.omnios ooce/library/libpng
 extra.omnios ooce/library/libsodium
@@ -65,8 +70,10 @@ extra.omnios ooce/multimedia/x264
 extra.omnios ooce/multimedia/x265
 extra.omnios ooce/network/fping
 extra.omnios ooce/network/irssi
+extra.omnios ooce/network/mosh
 extra.omnios ooce/network/nsd
 extra.omnios ooce/network/openldap
+extra.omnios ooce/network/sic
 extra.omnios ooce/network/smtp/postfix
 extra.omnios ooce/network/tcpdump
 extra.omnios ooce/network/unbound
@@ -91,6 +98,7 @@ extra.omnios ooce/util/hyperfine
 extra.omnios ooce/util/jq
 extra.omnios ooce/util/pass
 extra.omnios ooce/util/rargs
+extra.omnios ooce/util/rlwrap
 extra.omnios ooce/util/stress-ng
 extra.omnios ooce/util/u-boot
 extra.omnios ooce/util/xjobs
diff --git a/doc/pkglist.aarch64 b/doc/pkglist.aarch64
index abfe75073..1831f74e9 100644
--- a/doc/pkglist.aarch64
+++ b/doc/pkglist.aarch64
@@ -74,6 +74,13 @@ ooce/library/jansson
 ooce/network/tcpdump
 ooce/system/top
 ooce/library/apr
+ooce/util/rlwrap
+ooce/developer/protobuf
+ooce/library/libdwarf
+ooce/library/libmcrypt
+ooce/network/sic
+ooce/application/tig
+ooce/developer/cunit
 ###############################################################################
 .SYSROOT
 ooce/audio/flac
@@ -90,6 +97,7 @@ ooce/security/minisign
 ooce/application/links
 ooce/database/mariadb-106
 ooce/developer/cmake
+ooce/network/mosh
 ###############################################################################
 .SYSROOT
 ooce/network/unbound