diff --git a/config/lib.json b/config/lib.json
index 47f3c7b8..3be97248 100644
--- a/config/lib.json
+++ b/config/lib.json
@@ -361,6 +361,9 @@
         "source": "libargon2",
         "static-libs-unix": [
             "libargon2.a"
+        ],
+        "lib-suggests": [
+            "libsodium"
         ]
     },
     "libavif": {
diff --git a/src/SPC/builder/extension/password_argon2.php b/src/SPC/builder/extension/password_argon2.php
index 30e6fd2c..d42fe4e3 100644
--- a/src/SPC/builder/extension/password_argon2.php
+++ b/src/SPC/builder/extension/password_argon2.php
@@ -24,25 +24,6 @@ class password_argon2 extends Extension
         }
     }
 
-    public function patchBeforeMake(): bool
-    {
-        $patched = parent::patchBeforeMake();
-        if ($this->builder->getLib('libsodium') !== null) {
-            $extraLibs = getenv('SPC_EXTRA_LIBS');
-            if ($extraLibs !== false) {
-                $extraLibs = str_replace(
-                    [BUILD_LIB_PATH . '/libargon2.a', BUILD_LIB_PATH . '/libsodium.a'],
-                    ['', BUILD_LIB_PATH . '/libargon2.a ' . BUILD_LIB_PATH . '/libsodium.a'],
-                    $extraLibs,
-                );
-                $extraLibs = trim(preg_replace('/\s+/', ' ', $extraLibs)); // normalize spacing
-                f_putenv('SPC_EXTRA_LIBS=' . $extraLibs);
-                return true;
-            }
-        }
-        return $patched;
-    }
-
     public function getConfigureArg(bool $shared = false): string
     {
         if ($this->builder->getLib('openssl') !== null) {
diff --git a/src/SPC/util/SPCConfigUtil.php b/src/SPC/util/SPCConfigUtil.php
index 7d2001f5..8c4fa926 100644
--- a/src/SPC/util/SPCConfigUtil.php
+++ b/src/SPC/util/SPCConfigUtil.php
@@ -80,7 +80,6 @@ class SPCConfigUtil
         $libs = $this->getLibsString($libraries, !$this->absolute_libs);
 
         // additional OS-specific libraries (e.g. macOS -lresolv)
-        // embed
         if ($extra_libs = SPCTarget::getRuntimeLibs()) {
             $libs .= " {$extra_libs}";
         }