diff --git a/classes/l4re.yaml b/classes/l4re.yaml
index a03a61be..65a11601 100644
--- a/classes/l4re.yaml
+++ b/classes/l4re.yaml
@@ -67,7 +67,7 @@ buildSetup: |
     # $3: targets (optional)
     l4reBuild()
     {
-        if [[ ! -e build/.bob-init-done ]] ; then
+        if [[ ! -e build/.bob-init-done || "$2" -nt build/.kconfig ]] ; then
             rm -rf $BOB_CWD/build
             make -C $1 B=$BOB_CWD/build \
                 DEFCONFIG="$2"
diff --git a/recipes/devel/swig.yaml b/recipes/devel/swig.yaml
index ba87b166..a501cfd5 100644
--- a/recipes/devel/swig.yaml
+++ b/recipes/devel/swig.yaml
@@ -18,7 +18,8 @@ depends:
 
 buildScript: |
     autotoolsBuild $1 \
-        --with-pcre2-prefix=${BOB_DEP_PATHS[libs::libpcre2-dev]}/usr
+        PCRE2_CFLAGS="$(pkg-config --cflags libpcre2-8)" \
+        PCRE2_LIBS="$(pkg-config --libs libpcre2-8)"
 
 multiPackage:
     "":
diff --git a/recipes/python/cryptography.yaml b/recipes/python/cryptography.yaml
index fc9f4cf1..f5e7c340 100644
--- a/recipes/python/cryptography.yaml
+++ b/recipes/python/cryptography.yaml
@@ -17,7 +17,9 @@ depends:
           - name: python::maturin
             alias: python::maturin-host
             use: [tools]
-          - python::cffi
+          - name: python::cffi
+            alias: python::cffi-host
+            use: [result]
           - name: libs::openssl-dev
             alias: openssl-host
             use: [result]
@@ -25,6 +27,7 @@ depends:
     - python::setuptools-rust
     - python::pycparser
     - python::semantic-version
+    - python::cffi
     - libs::openssl-dev
     - use: []
       depends:
@@ -41,6 +44,13 @@ buildSetup: |
     # caro builds a native-tool depending on python::cffi
     export HOST_CC=gcc
     export CARGO_BUILD_RUSTFLAGS="-C link-arg=-L${BOB_DEP_PATHS['openssl-host']}/usr/lib"
+    # A static libcrypto (host build) is built with zlib support but does not
+    # pull in zlib by itself.
+    if [[ ! -e ${OPENSSL_DIR}/lib/libcrypto.so ]] ; then
+        CARGO_TARGET_RUSTFLAGS_VAR=CARGO_TARGET_${CARGO_TARGET}_RUSTFLAGS
+        ZLIB_LIB_DIR="${BOB_ALL_PATHS['libs::zlib-dev']}/usr/lib"
+        export $CARGO_TARGET_RUSTFLAGS_VAR="${!CARGO_TARGET_RUSTFLAGS_VAR} -C link-arg=-L$ZLIB_LIB_DIR -C link-arg=-lz"
+    fi
 
 buildScript: |
     # without a git directory maturin fails with:
@@ -62,4 +72,5 @@ provideDeps:
     - python::setuptools-rust
     - python::pycparser
     - python::semantic-version
+    - python::cffi
     - '*-tgt'
diff --git a/recipes/utils/bmaptool.yaml b/recipes/utils/bmaptool.yaml
new file mode 100644
index 00000000..bb01bb24
--- /dev/null
+++ b/recipes/utils/bmaptool.yaml
@@ -0,0 +1,25 @@
+inherit: ["python3::build"]
+
+metaEnvironment:
+    PKG_VERSION: "3.9.0"
+    PKG_LICENSE: "GPL-2.0-only"
+
+depends:
+    - python::hatchling
+
+checkoutSCM:
+    scm: url
+    url: ${GITHUB_MIRROR}/yoctoproject/bmaptool/archive/refs/tags/v${PKG_VERSION}.tar.gz
+    digestSHA256: 9940bb97fa0f2c11ee4625a2f620a4ae2b94c556f8d01c070aee08486a2a1812
+    stripComponents: 1
+
+buildScript: |
+    python3Build $1
+
+packageScript: |
+    python3PackageTgt
+
+provideTools:
+    bmaptool:
+        path: usr/bin
+        dependTools: [python3]