diff --git a/Pkgfile b/Pkgfile
index 864f8fb..4e06fa2 100644
--- a/Pkgfile
+++ b/Pkgfile
@@ -248,6 +248,11 @@ vars:
   patch_sha256: ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd
   patch_sha512: fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd
 
+  # renovate: datasource=github-releases extractVersion=^pcre2-(?<version>.*)$ versioning=loose depName=PCRE2Project/pcre2
+  pcre2_version: 10.42
+  pcre2_sha256: 8d36cd8cb6ea2a4c2bb358ff6411b0c788633a2a45dabbf1aeb4b701d1b5e840
+  pcre2_sha512: 72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3
+
   # perl uses even numbered minor versions for stable releases - https://www.cpan.org/src/README.html
   # renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=Perl/perl5
   perl_version: 5.36.0
@@ -294,6 +299,11 @@ vars:
   squashfs_tools_sha256: 277b6e7f75a4a57f72191295ae62766a10d627a4f5e5f19eadfbc861378deea7
   squashfs_tools_sha512: b3934ea1e26c7508110312711465644a6d9674b6b5332a7d011e191fa3c1d4b8be694214794a0f6005263d0f4e18bab96af2f7ed66a178f8e3bb3a781cd44896
 
+  # renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=swig/swig
+  swig_version: 4.1.1
+  swig_sha256: 2af08aced8fcd65cdb5cc62426768914bedc735b1c250325203716f78e39ac9b
+  swig_sha512: 1cea1918455a75ebc9b2653dd1715bd5dcd974554955f324295c6a6f14c0a715651b221b85fad4a8af5197e0c75bfe7b590bc6ba7178c26245fbbd9a7e110100
+
   # renovate: datasource=git-tags extractVersion=^release_(?<version>.*)$ depName=git://git.savannah.gnu.org/tar.git
   tar_version: 1_34
   tar_sha256: 63bebd26879c5e1eea4352f0d03c991f966aeb3ddeb3c7445c902568d5411d28
diff --git a/pcre/pkg.yaml b/pcre/pkg.yaml
new file mode 100644
index 0000000..cf51730
--- /dev/null
+++ b/pcre/pkg.yaml
@@ -0,0 +1,36 @@
+name: pcre
+dependencies:
+  - stage: base
+  - stage: zlib
+  - stage: bzip2
+steps:
+  - sources:
+      - url: https://github.com/PCRE2Project/pcre2/releases/download/pcre2-{{ .pcre2_version }}/pcre2-{{ .pcre2_version }}.tar.bz2
+        destination: pcre.tar.bz2
+        sha256: "{{ .pcre2_sha256 }}"
+        sha512: "{{ .pcre2_sha512 }}"
+    prepare:
+      - |
+        tar -xjf pcre.tar.bz2 --strip-components=1
+        mkdir build
+        cd build
+        ../configure \
+            --prefix=${TOOLCHAIN} \
+              --enable-unicode-properties \
+              --enable-pcre216 \
+              --enable-pcre232 \
+              --enable-pcre2grep-libz \
+              --enable-pcre2grep-libbz2 \
+              --disable-static
+    build:
+      - |
+        cd build
+        make -j $(nproc)
+    install:
+      - |
+        cd build
+        make DESTDIR=/rootfs install
+        rm -rf /rootfs/toolchain/share
+finalize:
+  - from: /rootfs
+    to: /
diff --git a/swig/pkg.yaml b/swig/pkg.yaml
new file mode 100644
index 0000000..408fa4e
--- /dev/null
+++ b/swig/pkg.yaml
@@ -0,0 +1,33 @@
+name: swig
+dependencies:
+  - stage: base
+  - stage: zlib
+  - stage: pcre
+steps:
+  - sources:
+      - url: https://src.fedoraproject.org/lookaside/extras/swig/swig-{{ .swig_version }}.tar.gz/sha512/1cea1918455a75ebc9b2653dd1715bd5dcd974554955f324295c6a6f14c0a715651b221b85fad4a8af5197e0c75bfe7b590bc6ba7178c26245fbbd9a7e110100/swig-{{ .swig_version }}.tar.gz
+        destination: swig.tar.gz
+        sha256: "{{ .swig_sha256 }}"
+        sha512: "{{ .swig_sha512 }}"
+    prepare:
+      - |
+        tar -xzf swig.tar.gz --strip-components=1
+
+        mkdir build
+        cd build
+
+        ../configure \
+            --prefix=${TOOLCHAIN} \
+            --without-maximum-compile-warnings \
+            LDFLAGS="-Wl,-rpath=${TOOLCHAIN}/lib"
+    build:
+      - |
+        cd build
+        make -j $(nproc)
+    install:
+      - |
+        cd build
+        make DESTDIR=/rootfs install
+finalize:
+  - from: /rootfs
+    to: /
diff --git a/tools/pkg.yaml b/tools/pkg.yaml
index fbc0723..aa4a2e5 100644
--- a/tools/pkg.yaml
+++ b/tools/pkg.yaml
@@ -53,6 +53,7 @@ dependencies:
   - stage: openssl
   - stage: pahole
   - stage: patch
+  - stage: pcre
   - stage: perl
   - stage: pkg-config
   - stage: protobuf
@@ -62,6 +63,7 @@ dependencies:
   - stage: rhash
   - stage: sed
   - stage: squashfs-tools
+  - stage: swig
   - stage: tar
   - stage: tcl
   - stage: texinfo