diff --git a/build/php/build-82.sh b/build/php/build-82.sh
index 2e2591805..7bc079f55 100755
--- a/build/php/build-82.sh
+++ b/build/php/build-82.sh
@@ -32,6 +32,8 @@ SKIP_LICENCES=PHP
 # record .... too long
 export AWK
 
+[ $RELVER -le 151038 ] && CONFIGURE_CMD="/usr/bin/bash ./configure --no-reexec"
+
 MAJVER=${VER%.*}            # M.m
 sMAJVER=${MAJVER//./}       # Mm
 set_patchdir patches-$sMAJVER
diff --git a/build/rust/build.sh b/build/rust/build.sh
index ba4d5e5c0..02f24480e 100755
--- a/build/rust/build.sh
+++ b/build/rust/build.sh
@@ -23,6 +23,9 @@ SUMMARY="Rust systems programming language"
 DESC="Rust is a systems programming language that runs blazingly fast, "
 DESC+="prevents segfaults, and guarantees thread safety."
 
+# TODO: change the configure option back to `--enable-vendor` once
+# rust 1.68.0 has been released and the errno patch can be dropped
+
 set_builddir ${PROG}c-${VER}-src
 
 OPREFIX=$PREFIX
@@ -67,7 +70,7 @@ CONFIGURE_OPTS_64="
 
 CONFIGURE_OPTS+="
     --release-description=OmniOS/$RELVER
-    --enable-vendor
+    --disable-vendor
     --enable-extended
     --build=$RUSTARCH
     --target=$RUSTARCH
diff --git a/build/rust/patches/errno.patch b/build/rust/patches/errno.patch
new file mode 100644
index 000000000..b6ca31739
--- /dev/null
+++ b/build/rust/patches/errno.patch
@@ -0,0 +1,15 @@
+diff -wpruN '--exclude=*.orig' a~/Cargo.lock a/Cargo.lock
+--- a~/Cargo.lock	1970-01-01 00:00:00
++++ a/Cargo.lock	1970-01-01 00:00:00
+@@ -4644,9 +4644,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustix"
+-version = "0.36.3"
++version = "0.36.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e"
++checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
+ dependencies = [
+  "bitflags",
+  "errno",
diff --git a/build/rust/patches/series b/build/rust/patches/series
new file mode 100644
index 000000000..2e085f137
--- /dev/null
+++ b/build/rust/patches/series
@@ -0,0 +1 @@
+errno.patch