diff --git a/opam/virtual/octez-deps.opam.locked b/opam/virtual/octez-deps.opam.locked
index 000c3eead141b0dd9faddfc150de7a32134d7566..e91b88f7eb18245de94211aa47f58e0d6c8d8f53 100644
--- a/opam/virtual/octez-deps.opam.locked
+++ b/opam/virtual/octez-deps.opam.locked
@@ -296,6 +296,12 @@ conflicts: [
 available: os-family != "windows"
 dev-repo: "git+https://gitlab.com/tezos/tezos.git"
 pin-depends: [
-  "stdcompat.19"
-  "git+https://github.com/thierry-martinez/stdcompat.git#d53390d788027fe0a2282c4745eb3d1626341f99"
+  [
+    "base.v0.16.4"
+    "git+https://github.com/vch9/base.git#1d0cdedec2a8c63608d3c34531565903d5918ff6"
+  ]
+  [
+    "stdcompat.19"
+    "git+https://github.com/thierry-martinez/stdcompat.git#d53390d788027fe0a2282c4745eb3d1626341f99"
+  ]
 ]
diff --git a/scripts/update_opam_lock.sh b/scripts/update_opam_lock.sh
index cee4c89af1e2bbca771c9b60fc24cd6ac9bdd956..98fc32f973536a7967aca356edff2231d4ec66cb 100755
--- a/scripts/update_opam_lock.sh
+++ b/scripts/update_opam_lock.sh
@@ -86,6 +86,15 @@ export OPAMSOLVERTIMEOUT="${OPAMSOLVERTIMEOUT:-600}"
 echo "---- Pinning stdcompat"
 opam pin add https://github.com/thierry-martinez/stdcompat.git#d53390d788027fe0a2282c4745eb3d1626341f99 -n -y
 
+# Pin base to a commit that's compatible with latest versions of Mac OS.
+#
+# Base has a mechanism to detect if `-mpopcnt` is compatible with `cc`, it works
+# partially on recent versions of base. The version pinned is a fork of
+# `v0.16.4` cherry-picking a work-in-progress pull request that improves the
+# mechanism to check `-mpopcnt` compatibility.
+echo "---- Pinning base"
+opam pin add https://github.com/vch9/base.git#1d0cdedec2a8c63608d3c34531565903d5918ff6 -y
+
 # Ask opam to find a solution that covers both:
 # - 'octez-deps', so that we can compile Octez;
 # - 'octez-dev-deps', so that the solution is compatible with tools that devs