diff --git a/.github/workflows/Generate-PR.yml b/.github/workflows/Generate-PR.yml
index eae08be63..03138f440 100644
--- a/.github/workflows/Generate-PR.yml
+++ b/.github/workflows/Generate-PR.yml
@@ -530,6 +530,11 @@ jobs:
           fi
           # Try to update branch before finishing.
           [[ "${{ ( inputs.update_rebase_to_master ) }}" == 'true' ]] && gh pr update-branch --rebase || true
+          # Check to see if the PR is marked as WIP, in which case it should stay as draft.
+          if gh pr list -l "wip 🚧" --json number | jq --arg PR_NUMBER "$PR_NUMBER"  -e -r '.[]|select(.number=='$PR_NUMBER')' &>/dev/null; then
+            echo "PR ${PR_NUMBER} is set as WIP, so will be set or kept as Draft."
+            export DRAFT_PR=true
+          fi
           # Draft PRs can not be set to automerge.
           if [[ ${DRAFT_PR} == 'true' ]]; then
             gh pr ready --undo || true
diff --git a/lib/const.rb b/lib/const.rb
index 0d99234a9..fe769b5e3 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -471,6 +471,7 @@ unless defined?(CREW_ANITYA_PACKAGE_NAME_MAPPINGS)
     { pkg_name: 'rest', anitya_pkg: 'librest', comments: 'Prefer to GitHub' },
     { pkg_name: 'selenium_server_standalone', anitya_pkg: 'selenium', comments: '' },
     { pkg_name: 'signal_desktop', anitya_pkg: 'signal', comments: '' },
+    { pkg_name: 'smbclient', anitya_pkg: 'samba', comments: '' },
     { pkg_name: 'tepl_6', anitya_pkg: 'libgedit-tepl', comments: '' },
     { pkg_name: 'upx', anitya_pkg: 'upx', comments: 'Prefer to GitHub' },
     { pkg_name: 'vidstab', anitya_pkg: 'vid.stab', comments: 'Prefer to GitHub' },
diff --git a/manifest/armv7l/l/libngtcp2.filelist b/manifest/armv7l/l/libngtcp2.filelist
index a6802111b..d92d2bdd2 100644
--- a/manifest/armv7l/l/libngtcp2.filelist
+++ b/manifest/armv7l/l/libngtcp2.filelist
@@ -1,4 +1,4 @@
-# Total size: 2932017
+# Total size: 2990062
 /usr/local/include/ngtcp2/ngtcp2.h
 /usr/local/include/ngtcp2/ngtcp2_crypto.h
 /usr/local/include/ngtcp2/ngtcp2_crypto_gnutls.h
@@ -11,7 +11,7 @@
 /usr/local/lib/libngtcp2.a
 /usr/local/lib/libngtcp2.so
 /usr/local/lib/libngtcp2.so.16
-/usr/local/lib/libngtcp2.so.16.5.0
+/usr/local/lib/libngtcp2.so.16.7.0
 /usr/local/lib/libngtcp2_crypto_gnutls.a
 /usr/local/lib/libngtcp2_crypto_gnutls.so
 /usr/local/lib/libngtcp2_crypto_gnutls.so.8
diff --git a/manifest/armv7l/l/lmdb.filelist b/manifest/armv7l/l/lmdb.filelist
index f3e63495b..be632b5e4 100644
--- a/manifest/armv7l/l/lmdb.filelist
+++ b/manifest/armv7l/l/lmdb.filelist
@@ -1,4 +1,4 @@
-# Total size: 1798884
+# Total size: 866228
 /usr/local/bin/mdb_copy
 /usr/local/bin/mdb_dump
 /usr/local/bin/mdb_load
diff --git a/manifest/armv7l/s/smbclient.filelist b/manifest/armv7l/s/smbclient.filelist
index b3d2d316e..28dd38306 100644
--- a/manifest/armv7l/s/smbclient.filelist
+++ b/manifest/armv7l/s/smbclient.filelist
@@ -1,3 +1,4 @@
+# Total size: 32708076
 /usr/local/bin/net
 /usr/local/bin/nmblookup
 /usr/local/bin/rpcclient
@@ -16,15 +17,9 @@
 /usr/local/lib/libdcerpc-binding.so
 /usr/local/lib/libdcerpc-binding.so.0
 /usr/local/lib/libdcerpc-binding.so.0.0.1
-/usr/local/lib/libdcerpc-samr.so
-/usr/local/lib/libdcerpc-samr.so.0
-/usr/local/lib/libdcerpc-samr.so.0.0.1
 /usr/local/lib/libdcerpc-server-core.so
 /usr/local/lib/libdcerpc-server-core.so.0
 /usr/local/lib/libdcerpc-server-core.so.0.0.1
-/usr/local/lib/libdcerpc.so
-/usr/local/lib/libdcerpc.so.0
-/usr/local/lib/libdcerpc.so.0.0.1
 /usr/local/lib/libndr-krb5pac.so
 /usr/local/lib/libndr-krb5pac.so.0
 /usr/local/lib/libndr-krb5pac.so.0.0.1
@@ -35,43 +30,31 @@
 /usr/local/lib/libndr-standard.so.0
 /usr/local/lib/libndr-standard.so.0.0.1
 /usr/local/lib/libndr.so
-/usr/local/lib/libndr.so.4
-/usr/local/lib/libndr.so.4.0.0
+/usr/local/lib/libndr.so.6
+/usr/local/lib/libndr.so.6.0.0
 /usr/local/lib/libnetapi.so
 /usr/local/lib/libnetapi.so.1
 /usr/local/lib/libnetapi.so.1.0.0
 /usr/local/lib/libnss_winbind.so.2
 /usr/local/lib/libnss_wins.so.2
-/usr/local/lib/libsamba-credentials.so
-/usr/local/lib/libsamba-credentials.so.1
-/usr/local/lib/libsamba-credentials.so.1.0.0
 /usr/local/lib/libsamba-errors.so
 /usr/local/lib/libsamba-errors.so.1
 /usr/local/lib/libsamba-errors.so.1.0.0
-/usr/local/lib/libsamba-hostconfig.so
-/usr/local/lib/libsamba-hostconfig.so.0
-/usr/local/lib/libsamba-hostconfig.so.0.0.1
 /usr/local/lib/libsamba-passdb.so
 /usr/local/lib/libsamba-passdb.so.0
-/usr/local/lib/libsamba-passdb.so.0.28.0
+/usr/local/lib/libsamba-passdb.so.0.30.0
 /usr/local/lib/libsamba-util.so
 /usr/local/lib/libsamba-util.so.0
 /usr/local/lib/libsamba-util.so.0.0.1
-/usr/local/lib/libsamdb.so
-/usr/local/lib/libsamdb.so.0
-/usr/local/lib/libsamdb.so.0.0.1
 /usr/local/lib/libsmbclient.so
 /usr/local/lib/libsmbclient.so.0
-/usr/local/lib/libsmbclient.so.0.8.0
+/usr/local/lib/libsmbclient.so.0.8.1
 /usr/local/lib/libsmbconf.so
 /usr/local/lib/libsmbconf.so.0
 /usr/local/lib/libsmbconf.so.0.0.1
 /usr/local/lib/libsmbldap.so
 /usr/local/lib/libsmbldap.so.2
 /usr/local/lib/libsmbldap.so.2.1.0
-/usr/local/lib/libtevent-util.so
-/usr/local/lib/libtevent-util.so.0
-/usr/local/lib/libtevent-util.so.0.0.1
 /usr/local/lib/libwbclient.so
 /usr/local/lib/libwbclient.so.0
 /usr/local/lib/libwbclient.so.0.16
@@ -108,8 +91,10 @@
 /usr/local/lib/samba/libcommon-auth-private-samba.so
 /usr/local/lib/samba/libdbwrap-private-samba.so
 /usr/local/lib/samba/libdcerpc-pkt-auth-private-samba.so
+/usr/local/lib/samba/libdcerpc-private-samba.so
 /usr/local/lib/samba/libdcerpc-samba-private-samba.so
 /usr/local/lib/samba/libdcerpc-samba4-private-samba.so
+/usr/local/lib/samba/libdcerpc-samr-private-samba.so
 /usr/local/lib/samba/libdnsserver-common-private-samba.so
 /usr/local/lib/samba/libdsdb-module-private-samba.so
 /usr/local/lib/samba/libevents-private-samba.so
@@ -133,6 +118,11 @@
 /usr/local/lib/samba/libkdc-private-samba.so
 /usr/local/lib/samba/libkrb5-private-samba.so
 /usr/local/lib/samba/libkrb5samba-private-samba.so
+/usr/local/lib/samba/libldb-cmdline-private-samba.so
+/usr/local/lib/samba/libldb-key-value-private-samba.so
+/usr/local/lib/samba/libldb-private-samba.so
+/usr/local/lib/samba/libldb-tdb-err-map-private-samba.so
+/usr/local/lib/samba/libldb-tdb-int-private-samba.so
 /usr/local/lib/samba/libldbsamba-private-samba.so
 /usr/local/lib/samba/liblibcli-lsa3-private-samba.so
 /usr/local/lib/samba/liblibcli-netlogon3-private-samba.so
@@ -151,21 +141,27 @@
 /usr/local/lib/samba/libposix-eadb-private-samba.so
 /usr/local/lib/samba/libprinter-driver-private-samba.so
 /usr/local/lib/samba/libprinting-migrate-private-samba.so
+/usr/local/lib/samba/libquic-private-samba.so
 /usr/local/lib/samba/libregistry-private-samba.so
 /usr/local/lib/samba/libreplace-private-samba.so
 /usr/local/lib/samba/libroken-private-samba.so
 /usr/local/lib/samba/libsamba-cluster-support-private-samba.so
+/usr/local/lib/samba/libsamba-credentials-private-samba.so
 /usr/local/lib/samba/libsamba-debug-private-samba.so
+/usr/local/lib/samba/libsamba-hostconfig-private-samba.so
 /usr/local/lib/samba/libsamba-modules-private-samba.so
+/usr/local/lib/samba/libsamba-net-private-samba.so
+/usr/local/lib/samba/libsamba-policy-private-samba.so
 /usr/local/lib/samba/libsamba-security-private-samba.so
+/usr/local/lib/samba/libsamba-security-trusts-private-samba.so
 /usr/local/lib/samba/libsamba-sockets-private-samba.so
 /usr/local/lib/samba/libsamba3-util-private-samba.so
 /usr/local/lib/samba/libsamdb-common-private-samba.so
+/usr/local/lib/samba/libsamdb-private-samba.so
 /usr/local/lib/samba/libsecrets3-private-samba.so
 /usr/local/lib/samba/libserver-id-db-private-samba.so
 /usr/local/lib/samba/libserver-role-private-samba.so
 /usr/local/lib/samba/libshares-private-samba.so
-/usr/local/lib/samba/libsmb-transport-private-samba.so
 /usr/local/lib/samba/libsmbclient-raw-private-samba.so
 /usr/local/lib/samba/libsmbd-base-private-samba.so
 /usr/local/lib/samba/libsmbd-shim-private-samba.so
@@ -177,9 +173,10 @@
 /usr/local/lib/samba/libtalloc-report-printf-private-samba.so
 /usr/local/lib/samba/libtalloc-report-private-samba.so
 /usr/local/lib/samba/libtdb-wrap-private-samba.so
+/usr/local/lib/samba/libtevent-util-private-samba.so
 /usr/local/lib/samba/libtime-basic-private-samba.so
 /usr/local/lib/samba/libtorture-private-samba.so
-/usr/local/lib/samba/libtrusts-util-private-samba.so
+/usr/local/lib/samba/libutil-crypt-private-samba.so
 /usr/local/lib/samba/libutil-reg-private-samba.so
 /usr/local/lib/samba/libutil-setid-private-samba.so
 /usr/local/lib/samba/libutil-tdb-private-samba.so
diff --git a/manifest/i686/l/libngtcp2.filelist b/manifest/i686/l/libngtcp2.filelist
index ea9483bdb..315f07559 100644
--- a/manifest/i686/l/libngtcp2.filelist
+++ b/manifest/i686/l/libngtcp2.filelist
@@ -1,4 +1,4 @@
-# Total size: 3066777
+# Total size: 3126846
 /usr/local/include/ngtcp2/ngtcp2.h
 /usr/local/include/ngtcp2/ngtcp2_crypto.h
 /usr/local/include/ngtcp2/ngtcp2_crypto_gnutls.h
@@ -11,7 +11,7 @@
 /usr/local/lib/libngtcp2.a
 /usr/local/lib/libngtcp2.so
 /usr/local/lib/libngtcp2.so.16
-/usr/local/lib/libngtcp2.so.16.5.0
+/usr/local/lib/libngtcp2.so.16.7.0
 /usr/local/lib/libngtcp2_crypto_gnutls.a
 /usr/local/lib/libngtcp2_crypto_gnutls.so
 /usr/local/lib/libngtcp2_crypto_gnutls.so.8
diff --git a/manifest/i686/s/smbclient.filelist b/manifest/i686/s/smbclient.filelist
deleted file mode 100644
index b3d2d316e..000000000
--- a/manifest/i686/s/smbclient.filelist
+++ /dev/null
@@ -1,198 +0,0 @@
-/usr/local/bin/net
-/usr/local/bin/nmblookup
-/usr/local/bin/rpcclient
-/usr/local/bin/smbcacls
-/usr/local/bin/smbclient
-/usr/local/bin/smbcquotas
-/usr/local/bin/smbget
-/usr/local/bin/smbspool
-/usr/local/bin/smbtar
-/usr/local/bin/smbtree
-/usr/local/etc/samba/smb.conf
-/usr/local/include/samba-4.0/libsmbclient.h
-/usr/local/include/samba-4.0/netapi.h
-/usr/local/include/samba-4.0/wbclient.h
-/usr/local/lib/cups/backend/smb
-/usr/local/lib/libdcerpc-binding.so
-/usr/local/lib/libdcerpc-binding.so.0
-/usr/local/lib/libdcerpc-binding.so.0.0.1
-/usr/local/lib/libdcerpc-samr.so
-/usr/local/lib/libdcerpc-samr.so.0
-/usr/local/lib/libdcerpc-samr.so.0.0.1
-/usr/local/lib/libdcerpc-server-core.so
-/usr/local/lib/libdcerpc-server-core.so.0
-/usr/local/lib/libdcerpc-server-core.so.0.0.1
-/usr/local/lib/libdcerpc.so
-/usr/local/lib/libdcerpc.so.0
-/usr/local/lib/libdcerpc.so.0.0.1
-/usr/local/lib/libndr-krb5pac.so
-/usr/local/lib/libndr-krb5pac.so.0
-/usr/local/lib/libndr-krb5pac.so.0.0.1
-/usr/local/lib/libndr-nbt.so
-/usr/local/lib/libndr-nbt.so.0
-/usr/local/lib/libndr-nbt.so.0.0.1
-/usr/local/lib/libndr-standard.so
-/usr/local/lib/libndr-standard.so.0
-/usr/local/lib/libndr-standard.so.0.0.1
-/usr/local/lib/libndr.so
-/usr/local/lib/libndr.so.4
-/usr/local/lib/libndr.so.4.0.0
-/usr/local/lib/libnetapi.so
-/usr/local/lib/libnetapi.so.1
-/usr/local/lib/libnetapi.so.1.0.0
-/usr/local/lib/libnss_winbind.so.2
-/usr/local/lib/libnss_wins.so.2
-/usr/local/lib/libsamba-credentials.so
-/usr/local/lib/libsamba-credentials.so.1
-/usr/local/lib/libsamba-credentials.so.1.0.0
-/usr/local/lib/libsamba-errors.so
-/usr/local/lib/libsamba-errors.so.1
-/usr/local/lib/libsamba-errors.so.1.0.0
-/usr/local/lib/libsamba-hostconfig.so
-/usr/local/lib/libsamba-hostconfig.so.0
-/usr/local/lib/libsamba-hostconfig.so.0.0.1
-/usr/local/lib/libsamba-passdb.so
-/usr/local/lib/libsamba-passdb.so.0
-/usr/local/lib/libsamba-passdb.so.0.28.0
-/usr/local/lib/libsamba-util.so
-/usr/local/lib/libsamba-util.so.0
-/usr/local/lib/libsamba-util.so.0.0.1
-/usr/local/lib/libsamdb.so
-/usr/local/lib/libsamdb.so.0
-/usr/local/lib/libsamdb.so.0.0.1
-/usr/local/lib/libsmbclient.so
-/usr/local/lib/libsmbclient.so.0
-/usr/local/lib/libsmbclient.so.0.8.0
-/usr/local/lib/libsmbconf.so
-/usr/local/lib/libsmbconf.so.0
-/usr/local/lib/libsmbconf.so.0.0.1
-/usr/local/lib/libsmbldap.so
-/usr/local/lib/libsmbldap.so.2
-/usr/local/lib/libsmbldap.so.2.1.0
-/usr/local/lib/libtevent-util.so
-/usr/local/lib/libtevent-util.so.0
-/usr/local/lib/libtevent-util.so.0.0.1
-/usr/local/lib/libwbclient.so
-/usr/local/lib/libwbclient.so.0
-/usr/local/lib/libwbclient.so.0.16
-/usr/local/lib/pkgconfig/netapi.pc
-/usr/local/lib/pkgconfig/smbclient.pc
-/usr/local/lib/pkgconfig/wbclient.pc
-/usr/local/lib/samba/libCHARSET3-private-samba.so
-/usr/local/lib/samba/libLIBWBCLIENT-OLD-private-samba.so
-/usr/local/lib/samba/libMESSAGING-SEND-private-samba.so
-/usr/local/lib/samba/libMESSAGING-private-samba.so
-/usr/local/lib/samba/libREG-FULL-private-samba.so
-/usr/local/lib/samba/libRPC-SERVER-LOOP-private-samba.so
-/usr/local/lib/samba/libRPC-WORKER-private-samba.so
-/usr/local/lib/samba/libaddns-private-samba.so
-/usr/local/lib/samba/libads-private-samba.so
-/usr/local/lib/samba/libasn1-private-samba.so
-/usr/local/lib/samba/libasn1util-private-samba.so
-/usr/local/lib/samba/libauth-private-samba.so
-/usr/local/lib/samba/libauth-unix-token-private-samba.so
-/usr/local/lib/samba/libauth4-private-samba.so
-/usr/local/lib/samba/libauthkrb5-private-samba.so
-/usr/local/lib/samba/libcli-cldap-private-samba.so
-/usr/local/lib/samba/libcli-ldap-common-private-samba.so
-/usr/local/lib/samba/libcli-ldap-private-samba.so
-/usr/local/lib/samba/libcli-nbt-private-samba.so
-/usr/local/lib/samba/libcli-smb-common-private-samba.so
-/usr/local/lib/samba/libcli-spoolss-private-samba.so
-/usr/local/lib/samba/libcliauth-private-samba.so
-/usr/local/lib/samba/libclidns-private-samba.so
-/usr/local/lib/samba/libcluster-private-samba.so
-/usr/local/lib/samba/libcmdline-contexts-private-samba.so
-/usr/local/lib/samba/libcmdline-private-samba.so
-/usr/local/lib/samba/libcom-err-private-samba.so
-/usr/local/lib/samba/libcommon-auth-private-samba.so
-/usr/local/lib/samba/libdbwrap-private-samba.so
-/usr/local/lib/samba/libdcerpc-pkt-auth-private-samba.so
-/usr/local/lib/samba/libdcerpc-samba-private-samba.so
-/usr/local/lib/samba/libdcerpc-samba4-private-samba.so
-/usr/local/lib/samba/libdnsserver-common-private-samba.so
-/usr/local/lib/samba/libdsdb-module-private-samba.so
-/usr/local/lib/samba/libevents-private-samba.so
-/usr/local/lib/samba/libflag-mapping-private-samba.so
-/usr/local/lib/samba/libgenrand-private-samba.so
-/usr/local/lib/samba/libgensec-private-samba.so
-/usr/local/lib/samba/libgpext-private-samba.so
-/usr/local/lib/samba/libgpo-private-samba.so
-/usr/local/lib/samba/libgse-private-samba.so
-/usr/local/lib/samba/libgss-preauth-private-samba.so
-/usr/local/lib/samba/libgssapi-private-samba.so
-/usr/local/lib/samba/libhcrypto-private-samba.so
-/usr/local/lib/samba/libhdb-private-samba.so
-/usr/local/lib/samba/libheimbase-private-samba.so
-/usr/local/lib/samba/libheimntlm-private-samba.so
-/usr/local/lib/samba/libhttp-private-samba.so
-/usr/local/lib/samba/libhx509-private-samba.so
-/usr/local/lib/samba/libidmap-private-samba.so
-/usr/local/lib/samba/libinterfaces-private-samba.so
-/usr/local/lib/samba/libiov-buf-private-samba.so
-/usr/local/lib/samba/libkdc-private-samba.so
-/usr/local/lib/samba/libkrb5-private-samba.so
-/usr/local/lib/samba/libkrb5samba-private-samba.so
-/usr/local/lib/samba/libldbsamba-private-samba.so
-/usr/local/lib/samba/liblibcli-lsa3-private-samba.so
-/usr/local/lib/samba/liblibcli-netlogon3-private-samba.so
-/usr/local/lib/samba/liblibsmb-private-samba.so
-/usr/local/lib/samba/libmessages-dgm-private-samba.so
-/usr/local/lib/samba/libmessages-util-private-samba.so
-/usr/local/lib/samba/libmscat-private-samba.so
-/usr/local/lib/samba/libmsghdr-private-samba.so
-/usr/local/lib/samba/libmsrpc3-private-samba.so
-/usr/local/lib/samba/libndr-samba-private-samba.so
-/usr/local/lib/samba/libndr-samba4-private-samba.so
-/usr/local/lib/samba/libnet-keytab-private-samba.so
-/usr/local/lib/samba/libnetif-private-samba.so
-/usr/local/lib/samba/libnpa-tstream-private-samba.so
-/usr/local/lib/samba/libnss-info-private-samba.so
-/usr/local/lib/samba/libposix-eadb-private-samba.so
-/usr/local/lib/samba/libprinter-driver-private-samba.so
-/usr/local/lib/samba/libprinting-migrate-private-samba.so
-/usr/local/lib/samba/libregistry-private-samba.so
-/usr/local/lib/samba/libreplace-private-samba.so
-/usr/local/lib/samba/libroken-private-samba.so
-/usr/local/lib/samba/libsamba-cluster-support-private-samba.so
-/usr/local/lib/samba/libsamba-debug-private-samba.so
-/usr/local/lib/samba/libsamba-modules-private-samba.so
-/usr/local/lib/samba/libsamba-security-private-samba.so
-/usr/local/lib/samba/libsamba-sockets-private-samba.so
-/usr/local/lib/samba/libsamba3-util-private-samba.so
-/usr/local/lib/samba/libsamdb-common-private-samba.so
-/usr/local/lib/samba/libsecrets3-private-samba.so
-/usr/local/lib/samba/libserver-id-db-private-samba.so
-/usr/local/lib/samba/libserver-role-private-samba.so
-/usr/local/lib/samba/libshares-private-samba.so
-/usr/local/lib/samba/libsmb-transport-private-samba.so
-/usr/local/lib/samba/libsmbclient-raw-private-samba.so
-/usr/local/lib/samba/libsmbd-base-private-samba.so
-/usr/local/lib/samba/libsmbd-shim-private-samba.so
-/usr/local/lib/samba/libsmbldaphelper-private-samba.so
-/usr/local/lib/samba/libsmbpasswdparser-private-samba.so
-/usr/local/lib/samba/libsocket-blocking-private-samba.so
-/usr/local/lib/samba/libstable-sort-private-samba.so
-/usr/local/lib/samba/libsys-rw-private-samba.so
-/usr/local/lib/samba/libtalloc-report-printf-private-samba.so
-/usr/local/lib/samba/libtalloc-report-private-samba.so
-/usr/local/lib/samba/libtdb-wrap-private-samba.so
-/usr/local/lib/samba/libtime-basic-private-samba.so
-/usr/local/lib/samba/libtorture-private-samba.so
-/usr/local/lib/samba/libtrusts-util-private-samba.so
-/usr/local/lib/samba/libutil-reg-private-samba.so
-/usr/local/lib/samba/libutil-setid-private-samba.so
-/usr/local/lib/samba/libutil-tdb-private-samba.so
-/usr/local/lib/samba/libwind-private-samba.so
-/usr/local/lib/samba/libxattr-tdb-private-samba.so
-/usr/local/share/man/man1/nmblookup.1.zst
-/usr/local/share/man/man1/rpcclient.1.zst
-/usr/local/share/man/man1/smbcacls.1.zst
-/usr/local/share/man/man1/smbclient.1.zst
-/usr/local/share/man/man1/smbcquotas.1.zst
-/usr/local/share/man/man1/smbget.1.zst
-/usr/local/share/man/man1/smbtar.1.zst
-/usr/local/share/man/man1/smbtree.1.zst
-/usr/local/share/man/man7/libsmbclient.7.zst
-/usr/local/share/man/man8/net.8.zst
-/usr/local/share/man/man8/smbspool.8.zst
diff --git a/manifest/x86_64/l/libngtcp2.filelist b/manifest/x86_64/l/libngtcp2.filelist
index 5edbc6fd3..8972b3231 100644
--- a/manifest/x86_64/l/libngtcp2.filelist
+++ b/manifest/x86_64/l/libngtcp2.filelist
@@ -1,4 +1,4 @@
-# Total size: 3053427
+# Total size: 3110276
 /usr/local/include/ngtcp2/ngtcp2.h
 /usr/local/include/ngtcp2/ngtcp2_crypto.h
 /usr/local/include/ngtcp2/ngtcp2_crypto_gnutls.h
@@ -11,7 +11,7 @@
 /usr/local/lib64/libngtcp2.a
 /usr/local/lib64/libngtcp2.so
 /usr/local/lib64/libngtcp2.so.16
-/usr/local/lib64/libngtcp2.so.16.5.0
+/usr/local/lib64/libngtcp2.so.16.7.0
 /usr/local/lib64/libngtcp2_crypto_gnutls.a
 /usr/local/lib64/libngtcp2_crypto_gnutls.so
 /usr/local/lib64/libngtcp2_crypto_gnutls.so.8
diff --git a/manifest/x86_64/l/lmdb.filelist b/manifest/x86_64/l/lmdb.filelist
index 92897aa9b..304d4053a 100644
--- a/manifest/x86_64/l/lmdb.filelist
+++ b/manifest/x86_64/l/lmdb.filelist
@@ -1,4 +1,4 @@
-# Total size: 1825822
+# Total size: 902106
 /usr/local/bin/mdb_copy
 /usr/local/bin/mdb_dump
 /usr/local/bin/mdb_load
diff --git a/manifest/x86_64/s/smbclient.filelist b/manifest/x86_64/s/smbclient.filelist
index ec83f66b5..ad585f849 100644
--- a/manifest/x86_64/s/smbclient.filelist
+++ b/manifest/x86_64/s/smbclient.filelist
@@ -1,3 +1,4 @@
+# Total size: 34476274
 /usr/local/bin/net
 /usr/local/bin/nmblookup
 /usr/local/bin/rpcclient
@@ -16,15 +17,9 @@
 /usr/local/lib64/libdcerpc-binding.so
 /usr/local/lib64/libdcerpc-binding.so.0
 /usr/local/lib64/libdcerpc-binding.so.0.0.1
-/usr/local/lib64/libdcerpc-samr.so
-/usr/local/lib64/libdcerpc-samr.so.0
-/usr/local/lib64/libdcerpc-samr.so.0.0.1
 /usr/local/lib64/libdcerpc-server-core.so
 /usr/local/lib64/libdcerpc-server-core.so.0
 /usr/local/lib64/libdcerpc-server-core.so.0.0.1
-/usr/local/lib64/libdcerpc.so
-/usr/local/lib64/libdcerpc.so.0
-/usr/local/lib64/libdcerpc.so.0.0.1
 /usr/local/lib64/libndr-krb5pac.so
 /usr/local/lib64/libndr-krb5pac.so.0
 /usr/local/lib64/libndr-krb5pac.so.0.0.1
@@ -35,43 +30,31 @@
 /usr/local/lib64/libndr-standard.so.0
 /usr/local/lib64/libndr-standard.so.0.0.1
 /usr/local/lib64/libndr.so
-/usr/local/lib64/libndr.so.4
-/usr/local/lib64/libndr.so.4.0.0
+/usr/local/lib64/libndr.so.6
+/usr/local/lib64/libndr.so.6.0.0
 /usr/local/lib64/libnetapi.so
 /usr/local/lib64/libnetapi.so.1
 /usr/local/lib64/libnetapi.so.1.0.0
 /usr/local/lib64/libnss_winbind.so.2
 /usr/local/lib64/libnss_wins.so.2
-/usr/local/lib64/libsamba-credentials.so
-/usr/local/lib64/libsamba-credentials.so.1
-/usr/local/lib64/libsamba-credentials.so.1.0.0
 /usr/local/lib64/libsamba-errors.so
 /usr/local/lib64/libsamba-errors.so.1
 /usr/local/lib64/libsamba-errors.so.1.0.0
-/usr/local/lib64/libsamba-hostconfig.so
-/usr/local/lib64/libsamba-hostconfig.so.0
-/usr/local/lib64/libsamba-hostconfig.so.0.0.1
 /usr/local/lib64/libsamba-passdb.so
 /usr/local/lib64/libsamba-passdb.so.0
-/usr/local/lib64/libsamba-passdb.so.0.28.0
+/usr/local/lib64/libsamba-passdb.so.0.30.0
 /usr/local/lib64/libsamba-util.so
 /usr/local/lib64/libsamba-util.so.0
 /usr/local/lib64/libsamba-util.so.0.0.1
-/usr/local/lib64/libsamdb.so
-/usr/local/lib64/libsamdb.so.0
-/usr/local/lib64/libsamdb.so.0.0.1
 /usr/local/lib64/libsmbclient.so
 /usr/local/lib64/libsmbclient.so.0
-/usr/local/lib64/libsmbclient.so.0.8.0
+/usr/local/lib64/libsmbclient.so.0.8.1
 /usr/local/lib64/libsmbconf.so
 /usr/local/lib64/libsmbconf.so.0
 /usr/local/lib64/libsmbconf.so.0.0.1
 /usr/local/lib64/libsmbldap.so
 /usr/local/lib64/libsmbldap.so.2
 /usr/local/lib64/libsmbldap.so.2.1.0
-/usr/local/lib64/libtevent-util.so
-/usr/local/lib64/libtevent-util.so.0
-/usr/local/lib64/libtevent-util.so.0.0.1
 /usr/local/lib64/libwbclient.so
 /usr/local/lib64/libwbclient.so.0
 /usr/local/lib64/libwbclient.so.0.16
@@ -108,8 +91,10 @@
 /usr/local/lib64/samba/libcommon-auth-private-samba.so
 /usr/local/lib64/samba/libdbwrap-private-samba.so
 /usr/local/lib64/samba/libdcerpc-pkt-auth-private-samba.so
+/usr/local/lib64/samba/libdcerpc-private-samba.so
 /usr/local/lib64/samba/libdcerpc-samba-private-samba.so
 /usr/local/lib64/samba/libdcerpc-samba4-private-samba.so
+/usr/local/lib64/samba/libdcerpc-samr-private-samba.so
 /usr/local/lib64/samba/libdnsserver-common-private-samba.so
 /usr/local/lib64/samba/libdsdb-module-private-samba.so
 /usr/local/lib64/samba/libevents-private-samba.so
@@ -133,6 +118,12 @@
 /usr/local/lib64/samba/libkdc-private-samba.so
 /usr/local/lib64/samba/libkrb5-private-samba.so
 /usr/local/lib64/samba/libkrb5samba-private-samba.so
+/usr/local/lib64/samba/libldb-cmdline-private-samba.so
+/usr/local/lib64/samba/libldb-key-value-private-samba.so
+/usr/local/lib64/samba/libldb-mdb-int-private-samba.so
+/usr/local/lib64/samba/libldb-private-samba.so
+/usr/local/lib64/samba/libldb-tdb-err-map-private-samba.so
+/usr/local/lib64/samba/libldb-tdb-int-private-samba.so
 /usr/local/lib64/samba/libldbsamba-private-samba.so
 /usr/local/lib64/samba/liblibcli-lsa3-private-samba.so
 /usr/local/lib64/samba/liblibcli-netlogon3-private-samba.so
@@ -151,21 +142,27 @@
 /usr/local/lib64/samba/libposix-eadb-private-samba.so
 /usr/local/lib64/samba/libprinter-driver-private-samba.so
 /usr/local/lib64/samba/libprinting-migrate-private-samba.so
+/usr/local/lib64/samba/libquic-private-samba.so
 /usr/local/lib64/samba/libregistry-private-samba.so
 /usr/local/lib64/samba/libreplace-private-samba.so
 /usr/local/lib64/samba/libroken-private-samba.so
 /usr/local/lib64/samba/libsamba-cluster-support-private-samba.so
+/usr/local/lib64/samba/libsamba-credentials-private-samba.so
 /usr/local/lib64/samba/libsamba-debug-private-samba.so
+/usr/local/lib64/samba/libsamba-hostconfig-private-samba.so
 /usr/local/lib64/samba/libsamba-modules-private-samba.so
+/usr/local/lib64/samba/libsamba-net-private-samba.so
+/usr/local/lib64/samba/libsamba-policy-private-samba.so
 /usr/local/lib64/samba/libsamba-security-private-samba.so
+/usr/local/lib64/samba/libsamba-security-trusts-private-samba.so
 /usr/local/lib64/samba/libsamba-sockets-private-samba.so
 /usr/local/lib64/samba/libsamba3-util-private-samba.so
 /usr/local/lib64/samba/libsamdb-common-private-samba.so
+/usr/local/lib64/samba/libsamdb-private-samba.so
 /usr/local/lib64/samba/libsecrets3-private-samba.so
 /usr/local/lib64/samba/libserver-id-db-private-samba.so
 /usr/local/lib64/samba/libserver-role-private-samba.so
 /usr/local/lib64/samba/libshares-private-samba.so
-/usr/local/lib64/samba/libsmb-transport-private-samba.so
 /usr/local/lib64/samba/libsmbclient-raw-private-samba.so
 /usr/local/lib64/samba/libsmbd-base-private-samba.so
 /usr/local/lib64/samba/libsmbd-shim-private-samba.so
@@ -177,9 +174,10 @@
 /usr/local/lib64/samba/libtalloc-report-printf-private-samba.so
 /usr/local/lib64/samba/libtalloc-report-private-samba.so
 /usr/local/lib64/samba/libtdb-wrap-private-samba.so
+/usr/local/lib64/samba/libtevent-util-private-samba.so
 /usr/local/lib64/samba/libtime-basic-private-samba.so
 /usr/local/lib64/samba/libtorture-private-samba.so
-/usr/local/lib64/samba/libtrusts-util-private-samba.so
+/usr/local/lib64/samba/libutil-crypt-private-samba.so
 /usr/local/lib64/samba/libutil-reg-private-samba.so
 /usr/local/lib64/samba/libutil-setid-private-samba.so
 /usr/local/lib64/samba/libutil-tdb-private-samba.so
diff --git a/packages/libngtcp2.rb b/packages/libngtcp2.rb
index d025159f4..329e196fc 100644
--- a/packages/libngtcp2.rb
+++ b/packages/libngtcp2.rb
@@ -6,7 +6,7 @@ require 'buildsystems/cmake'
 class Libngtcp2 < CMake
   description 'Implementation of IETF QUIC protocol'
   homepage 'https://github.com/ngtcp2/ngtcp2'
-  version '1.15.1'
+  version '1.17.0'
   license 'MIT'
   compatibility 'all'
   source_url 'https://github.com/ngtcp2/ngtcp2.git'
@@ -14,10 +14,10 @@ class Libngtcp2 < CMake
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'e614cbdbba9b8c2bd5a63122fe2662b961e4a05aaef1f8e78e191f6ff34d2169',
-     armv7l: 'e614cbdbba9b8c2bd5a63122fe2662b961e4a05aaef1f8e78e191f6ff34d2169',
-       i686: '6a353295c0aec7155d96c432d40408d146012f4c95c9357e67be5a2a4db79a65',
-     x86_64: '91ae00d0036b90e0a8ab460b3a4d8172177d3ee063d27b35ed511981b84af0c3'
+    aarch64: '33cd334939c5c03230468b0a9c542ddc0bbabd2d7679078d95334c6ddef92228',
+     armv7l: '33cd334939c5c03230468b0a9c542ddc0bbabd2d7679078d95334c6ddef92228',
+       i686: 'b5f41bef0676f0dbc3eb49dd757b563b2ee8a376dcaf0fc9bd80dcaeee0608f8',
+     x86_64: '17ba79d8e56fb1a109bc3cbb74fcdcaac51a9b8bfe7c948e0852999eebec240f'
   })
 
   depends_on 'glibc' # R
diff --git a/packages/smbclient.rb b/packages/smbclient.rb
index a39953c24..cc86e513c 100644
--- a/packages/smbclient.rb
+++ b/packages/smbclient.rb
@@ -3,25 +3,24 @@ require 'package'
 class Smbclient < Package
   description 'Tools to access a servers filespace and printers via SMB'
   homepage 'https://www.samba.org'
-  version "4.20.4-#{CREW_ICU_VER}"
+  version "4.23.3-#{CREW_ICU_VER}"
   license 'GPLv3'
-  compatibility 'all'
+  compatibility 'aarch64 armv7l x86_64'
   source_url "https://download.samba.org/pub/samba/stable/samba-#{version.split('-').first}.tar.gz"
-  source_sha256 '3a92e97eaeb345b6b32232f503e14d34f03a7aa64c451fe8c258a11bbda908e5'
+  source_sha256 '06cdbb27a6956978b045455fe0696d998ffbac8d24ba24de87a4ef8200813320'
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'f161a7f955ecca54425add1cfd6683eabb204c15c9fd77894abe33f5546ac30f',
-     armv7l: 'f161a7f955ecca54425add1cfd6683eabb204c15c9fd77894abe33f5546ac30f',
-       i686: 'e3cf441f53e3137b89bd92c3518d76c68ac1323636ee116613d2a00f7dcc0c60',
-     x86_64: '0d52fa1f276bd5ec3ac28b4b6e132a33c4401f247a65c81626c53cfffdc25db1'
+    aarch64: 'c18bf2258061a8c2d35c8c1ab543fbb3892f9178430a7949909874785fded7d5',
+     armv7l: 'c18bf2258061a8c2d35c8c1ab543fbb3892f9178430a7949909874785fded7d5',
+     x86_64: 'caca312edf13377fe71e33f754a14fc9798dbb12095ece60e3a61428e1b5e7ba'
   })
 
   depends_on 'acl' # R
   depends_on 'avahi' # R
   depends_on 'cmocka' => :build
   depends_on 'cups' => :build
-  depends_on 'docbook' => :build
+  depends_on 'docbook' => :build # We still need to set @xml_catalog_files since the XML_CATALOG_FILES env variable might not get picked up before the build.
   depends_on 'gcc_lib' # R
   depends_on 'gdb' => :build
   depends_on 'glibc' # R
@@ -29,17 +28,19 @@ class Smbclient < Package
   depends_on 'gpgme' => :build
   depends_on 'icu4c' # R
   depends_on 'jansson' # R
-  depends_on 'ldb' # R
+  depends_on 'ldb' => :build
   depends_on 'libarchive' # R
   depends_on 'libbsd' # R
   depends_on 'libcap' # R
+  depends_on 'libngtcp2' # R
   depends_on 'libtasn1' # R
-  depends_on 'libtirpc' # R
-  depends_on 'libunwind' # R
+  depends_on 'libtirpc' => :build
+  depends_on 'libunwind' => :build
   depends_on 'liburing' => :build
+  depends_on 'libxcrypt' # R
   depends_on 'linux_pam' # R
-  depends_on 'lmdb' => :build
-  depends_on 'ncurses' # R
+  depends_on 'lmdb' # R
+  depends_on 'ncurses' => :build
   depends_on 'openldap' # R
   depends_on 'perl_json' => :build
   depends_on 'perl_parse_yapp' => :build
@@ -50,6 +51,7 @@ class Smbclient < Package
   depends_on 'talloc' # R
   depends_on 'tdb' # R
   depends_on 'tevent' # R
+  depends_on 'xmlto' => :build
   depends_on 'zlib' # R
 
   @samba4_idmap_modules = 'idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2'
@@ -60,7 +62,7 @@ class Smbclient < Package
                        smbcquotas smbget net nmblookup smbtar]
   @smbclient_pkgconfig = %w[smbclient netapi wbclient]
 
-  @xml_catalog_files = ENV.fetch('XML_CATALOG_FILES', nil)
+  @xml_catalog_files = ENV.fetch('XML_CATALOG_FILES', "#{CREW_PREFIX}/etc/xml/catalog")
 
   def self.patch
     system "sed -e 's:<gpgme.h>:<gpgme/gpgme.h>:' \
@@ -81,7 +83,7 @@ class Smbclient < Package
       --with-configdir=#{CREW_PREFIX}/etc/samba \
       --with-lockdir=#{CREW_PREFIX}/var/cache/samba \
       --builtin-libraries=NONE \
-      --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt,!ldb,!pyldb-util,NONE \
+      --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt,!ldb,!pyldb-util,libquic,NONE \
       --disable-python \
       --disable-rpath \
       --disable-rpath-install \
@@ -92,16 +94,17 @@ class Smbclient < Package
       --with-pammodulesdir=#{CREW_LIB_PREFIX}/security \
       --with-piddir=/run \
       --with-profiling-data \
-      --with-shared-modules=#{@samba4_idmap_modules},#{@samba4_pdb_modules},#{@samba4_auth_modules},vfs_io_uring \
+      --with-shared-modules=#{@samba4_idmap_modules},#{@samba4_pdb_modules},#{@samba4_auth_modules} \
       --with-sockets-dir=/run/samba \
       --without-ad-dc \
+      --without-smb1-server \
       --with-winbind \
       --without-systemd"
     system 'make'
     # We only need some files from the build, so just install into a
     # staging directory during build.
     FileUtils.mkdir_p 'staging'
-    system 'make V=1 DESTDIR=staging install'
+    system 'make V=1 DESTDIR=staging install', exception: false
     FileUtils.cp 'source3/script/smbtar', "staging/#{CREW_PREFIX}/bin/"
   end
 
diff --git a/tools/build_updated_packages.rb b/tools/build_updated_packages.rb
index 845d8cf6e..8c0d4a20b 100755
--- a/tools/build_updated_packages.rb
+++ b/tools/build_updated_packages.rb
@@ -1,5 +1,5 @@
 #!/usr/local/bin/ruby
-# build_updated_packages version 3.7 (for Chromebrew)
+# build_updated_packages version 3.8 (for Chromebrew)
 # This updates the versions in python pip packages by calling
 # tools/update_python_pip_packages.rb, checks for updated ruby packages
 # by calling tools/update_ruby_gem_packages.rb, and then checks if any
@@ -70,7 +70,7 @@ def self.check_build_uploads(architectures_to_check = nil, name = nil)
   return builds_needed
 end
 
-def update_hashes(name = nil)
+def update_hashes_and_manifests(name = nil)
   unless CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES
     remote_binary = { armv7l: nil, i686: nil, x86_64: nil }
     remote_binary.keys.each do |arch|
@@ -82,11 +82,27 @@ def update_hashes(name = nil)
     # Add build hashes.
     system "crew update_package_file #{name}" unless remote_binary.values.all?(nil)
     # Add manifests if we are in the right architecture.
-    # Using crew reinstall -f package here updates the hashes for
-    # binaries.
-    if system("yes | crew reinstall --regenerate-filelist #{'-f' unless CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES} #{name}") && File.exist?("#{CREW_META_PATH}/#{name}.filelist") && File.directory?(CREW_LOCAL_REPO_ROOT)
-      puts 'Adding manifests...'
-      FileUtils.cp "#{CREW_META_PATH}/#{name}.filelist", "#{CREW_LOCAL_REPO_ROOT}/manifest/#{ARCH}/#{name.chr}/#{name}.filelist"
+    if @pkg_obj.compatibility == 'all' || @pkg_obj.compatibility.include?(ARCH)
+      # Using crew reinstall -f package here updates the hashes for
+      # binaries.
+      if system("yes | crew reinstall --regenerate-filelist #{'-f' unless CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES} #{name}") && File.exist?("#{CREW_META_PATH}/#{name}.filelist") && File.directory?(CREW_LOCAL_REPO_ROOT)
+        puts 'Adding manifests...'
+        FileUtils.cp "#{CREW_META_PATH}/#{name}.filelist", "#{CREW_LOCAL_REPO_ROOT}/manifest/#{ARCH}/#{name.chr}/#{name}.filelist"
+      end
+    else
+      puts "Package #{name} is not compatible with your device architecture (#{ARCH}). Manifests will not be added.".orange
+      return
+    end
+  end
+end
+
+def update_deps(name = nil)
+  unless CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES
+    # Update package dependencies.
+    if @pkg_obj.compatibility == 'all' || @pkg_obj.compatibility.include?(ARCH)
+      Kernel.system "tools/getrealdeps.rb #{name}"
+    else
+      puts "Package #{name} is not compatible with your device architecture (#{ARCH}). Dependencies will not be checked.".orange
     end
   end
 end
@@ -161,7 +177,7 @@ updated_packages.each do |pkg|
   if !system("grep -q binary_sha256 #{pkg}") && !@pkg_obj.no_compile_needed? && !@pkg_obj.gem_compile_needed?
     puts "#{name.capitalize} #{@pkg_obj.version} has no binaries and may not need them.".lightgreen
     next pkg
-  elsif @pkg_obj.no_compile_needed?
+  elsif @pkg_obj.no_compile_needed? && (@pkg_obj.compatibility == 'all' || @pkg_obj.compatibility.include?(ARCH))
     # Using crew reinstall -f package here updates the hashes for
     # binaries.
     system "yes | crew reinstall #{'-f' unless CREW_BUILD_NO_PACKAGE_FILE_HASH_UPDATES} #{name}"
@@ -181,13 +197,10 @@ updated_packages.each do |pkg|
     builds_needed = check_build_uploads(architectures_to_check, name)
     if builds_needed.empty?
       puts "No builds are needed for #{name} #{@pkg_obj.version}.".lightgreen
-      update_hashes(name)
+      update_hashes_and_manifests(name)
+      update_deps(name)
       puts "Copying #{File.join(CREW_PACKAGES_PATH, pkg.sub('packages/', ''))} to #{pkg}".lightblue
       FileUtils.cp File.join(CREW_PACKAGES_PATH, pkg.sub('packages/', '')), pkg
-      if File.exist?("#{CREW_META_PATH}/#{name}.filelist") && File.directory?(CREW_LOCAL_REPO_ROOT)
-        puts 'Adding manifests.'
-        FileUtils.cp "#{CREW_META_PATH}/#{name}.filelist", "#{CREW_LOCAL_REPO_ROOT}/manifest/#{ARCH}/#{name.chr}/#{name}.filelist"
-      end
       next
     else
       puts "#{name.capitalize} #{@pkg_obj.version} needs builds uploaded for: #{builds_needed.join(' ')}".lightblue
diff --git a/tools/getrealdeps.rb b/tools/getrealdeps.rb
index c93c7daeb..5d150305d 100755
--- a/tools/getrealdeps.rb
+++ b/tools/getrealdeps.rb
@@ -1,5 +1,5 @@
 #!/usr/local/bin/ruby
-# getrealdeps version 2.3 (for Chromebrew)
+# getrealdeps version 2.4 (for Chromebrew)
 # Author: Satadru Pramanik (satmandu) satadru at gmail dot com
 require 'fileutils'
 
@@ -10,11 +10,13 @@ if crew_local_repo_root.to_s.empty?
   require_relative '../lib/color'
   require_relative '../lib/const'
   require_relative '../lib/package'
+  require_relative '../lib/package_utils'
   $LOAD_PATH.unshift File.expand_path('../lib', __dir__)
 else
   require File.join(crew_local_repo_root, 'lib/color')
   require File.join(crew_local_repo_root, 'lib/const')
   require File.join(crew_local_repo_root, 'lib/package')
+  require File.join(crew_local_repo_root, 'lib/package_utils')
   $LOAD_PATH.unshift File.expand_path(File.join(crew_local_repo_root, 'lib'), __dir__)
 end
 
@@ -107,7 +109,13 @@ def write_deps(pkg_file, pkgdeps, pkg)
 
   # Check for and delete old runtime dependencies.
   # Its unsafe to do this with other dependencies, because the packager might know something we don't.
-  pkgdepsblock.delete_if { |line| line.match(/  depends_on '(.*)' # R/) { |matchdata| pkgdeps.none?(matchdata[1]) && !privileged_deps.include?(matchdata[1]) } }
+  # pkgdepsblock.delete_if { |line| line.match(/  depends_on '(.*)' # R/) { |matchdata| pkgdeps.none?(matchdata[1]) && !privileged_deps.include?(matchdata[1]) } }
+
+  # We need to figure out how to handle architecture specific dependencies.
+  # e.g., smbclient on x86_64 has a lmdb dependency, but not on armv7l.
+  pkgdepsblock.each do |line|
+    puts "\n#{line.chomp} may no longer be necessary on #{ARCH} (or is only a build dependency).".orange if line.match(/  depends_on '(.*)' # R/) { |matchdata| pkgdeps.none?(matchdata[1]) && !privileged_deps.include?(matchdata[1]) }
+  end
 
   # If a dependency is both a build and a runtime dependency, we remove the build dependency.
   pkgdepsblock.delete_if { |line| line.match(/  depends_on '(.*)' => :build/) { |matchdata| missingpkgdeps.include?(matchdata[1]) } }
@@ -149,7 +157,7 @@ def write_deps(pkg_file, pkgdeps, pkg)
 end
 
 def main(pkg)
-  # pkg is pkg.name in this function.
+  # pkg is @pkg.name in this function.
   puts "Checking for the runtime dependencies of #{pkg}...".lightblue
   pkg_file = File.join(CREW_PACKAGES_PATH, "#{pkg}.rb")
   FileUtils.cp File.join(CREW_LOCAL_REPO_ROOT, "packages/#{pkg}.rb"), pkg_file if !CREW_LOCAL_REPO_ROOT.to_s.empty? && File.file?(File.join(CREW_LOCAL_REPO_ROOT, "packages/#{pkg}.rb"))
@@ -158,13 +166,22 @@ def main(pkg)
     define_singleton_method('pkgfilelist') { File.join(CREW_DEST_DIR, 'filelist') }
     abort('Pkg was not built.') unless File.exist?(pkgfilelist)
   else
-    define_singleton_method('pkgfilelist') { "#{CREW_PREFIX}/etc/crew/meta/#{pkg}.filelist" }
-    # Package needs to be installed for package filelist to be populated.
-    unless File.exist?(pkgfilelist)
-      puts "Installing #{pkg} because it is not installed."
-      system("yes | crew install #{pkg}")
+    # build_deps = `crew deps -b #{pkg} | sort -u`.split
+    packages_which_need_to_be_installed = @pkg.get_deps_list(include_build_deps: true)
+    # Add pkg to the list of packages we are going to install to make
+    # sure filelists are available.
+    packages_which_need_to_be_installed.push(@pkg.name)
+    puts "Checking for installation of #{pkg} and all of its build deps to make sure we check to see if any build deps are runtime deps.".orange
+    # Packages needs to be installed for package filelist to be populated.
+    packages_which_need_to_be_installed.each do |install_package|
+      @install_pkg = Package.load_package("packages/#{install_package}")
+      next if PackageUtils.installed?(@install_pkg.name)
+      define_singleton_method('pkgfilelist') { "#{CREW_PREFIX}/etc/crew/meta/#{install_package}.filelist" }
+      system("yes | crew install #{install_package}") unless File.exist?(pkgfilelist)
+      next if @install_pkg.is_fake?
+      abort "Package #{install_package} either does not exist or does not contain any libraries.".lightred unless File.exist?(pkgfilelist)
     end
-    abort("Package #{pkg} either does not exist or does not contain any libraries.") unless File.exist?(pkgfilelist)
+    define_singleton_method('pkgfilelist') { "#{CREW_PREFIX}/etc/crew/meta/#{pkg}.filelist" }
   end
 
   # Speed up grep.