diff --git a/pkgbuilds/shared/bun-bin/.SRCINFO b/pkgbuilds/shared/bun-bin/.SRCINFO
index c42a1ce..cd6268f 100644
--- a/pkgbuilds/shared/bun-bin/.SRCINFO
+++ b/pkgbuilds/shared/bun-bin/.SRCINFO
@@ -9,9 +9,11 @@ pkgbase = bun-bin
 	provides = bun
 	conflicts = bun
 	options = !debug
-	source_x86_64 = bun-x64-1.3.11.zip::https://github.com/oven-sh/bun/releases/download/bun-v1.3.11/bun-linux-x64.zip
+	source_x86_64 = bun-x64.zip::https://github.com/oven-sh/bun/releases/download/bun-v1.3.11/bun-linux-x64.zip
+	source_x86_64 = bun-x64-baseline.zip::https://github.com/oven-sh/bun/releases/download/bun-v1.3.11/bun-linux-x64-baseline.zip
 	source_x86_64 = LICENSE
 	sha256sums_x86_64 = 8611ba935af886f05a6f38740a15160326c15e5d5d07adef966130b4493607ed
+	sha256sums_x86_64 = abe346f63414547cdf6b35b7a649a490c728b93d006226156923918a84c0e59b
 	sha256sums_x86_64 = 9b296bcc20090b5ea079dc1bca15913a32246121169bcf54cbdb7384d6f5b32b
 	source_aarch64 = bun-aarch64-1.3.11.zip::https://github.com/oven-sh/bun/releases/download/bun-v1.3.11/bun-linux-aarch64.zip
 	source_aarch64 = LICENSE
diff --git a/pkgbuilds/shared/bun-bin/PKGBUILD b/pkgbuilds/shared/bun-bin/PKGBUILD
index 999ebc8..77c3f3e 100644
--- a/pkgbuilds/shared/bun-bin/PKGBUILD
+++ b/pkgbuilds/shared/bun-bin/PKGBUILD
@@ -13,36 +13,47 @@ provides=('bun')
 conflicts=('bun')
 options=('!debug')
 sha256sums_x86_64=('8611ba935af886f05a6f38740a15160326c15e5d5d07adef966130b4493607ed'
+                   'abe346f63414547cdf6b35b7a649a490c728b93d006226156923918a84c0e59b'
                    '9b296bcc20090b5ea079dc1bca15913a32246121169bcf54cbdb7384d6f5b32b')
 sha256sums_aarch64=('d13944da12a53ecc74bf6a720bd1d04c4555c038dfe422365356a7be47691fdf'
                     '9b296bcc20090b5ea079dc1bca15913a32246121169bcf54cbdb7384d6f5b32b')
 source_x86_64=(
-	"bun-x64-${pkgver}.zip::https://github.com/oven-sh/bun/releases/download/bun-v${pkgver}/bun-linux-x64.zip"
-	"LICENSE"
+"bun-x64.zip::https://github.com/oven-sh/bun/releases/download/bun-v${pkgver}/bun-linux-x64.zip"
+"bun-x64-baseline.zip::https://github.com/oven-sh/bun/releases/download/bun-v${pkgver}/bun-linux-x64-baseline.zip"
+"LICENSE"
 )
 source_aarch64=(
 	"bun-aarch64-${pkgver}.zip::https://github.com/oven-sh/bun/releases/download/bun-v${pkgver}/bun-linux-aarch64.zip"
 	"LICENSE"
 )
 build() {
-	if [ "${CARCH}" == "aarch64" ]; then
-		cd "bun-linux-aarch64"
+	if [ "${CARCH}" == "x86_64" ]; then
+    if grep -q avx2 /proc/cpuinfo; then
+      _srcdir="bun-linux-x64"
+    else
+      _srcdir="bun-linux-x64-baseline"
+    fi
 	else
-		cd "bun-linux-x64"
+		_srcdir="bun-linux-aarch64"
 	fi
+  cd "$srcdir/$_srcdir"
 	install -dm755 "completions"
 	SHELL=zsh "./bun" completions >"completions/bun.zsh"
 	SHELL=bash "./bun" completions >"completions/bun.bash"
 	SHELL=fish "./bun" completions >"completions/bun.fish"
 }
 package() {
-	if [ "${CARCH}" == "aarch64" ]; then
-		cd "bun-linux-aarch64"
-		install -Dm755 "./bun" "${pkgdir}/usr/bin/bun"
+	if [ "${CARCH}" == "x86_64" ]; then
+    if grep -q avx2 /proc/cpuinfo; then
+      _srcdir="bun-linux-x64"
+    else
+      _srcdir="bun-linux-x64-baseline"
+    fi
 	else
-		cd "bun-linux-x64"
-		install -Dm755 "./bun" "${pkgdir}/usr/bin/bun"
+		_srcdir="bun-linux-aarch64"
 	fi
+  cd "$srcdir/$_srcdir"
+  install -Dm755 "./bun" "${pkgdir}/usr/bin/bun"
 	# simlink as bunx as in the official install.sh
 	ln -s bun "${pkgdir}/usr/bin/bunx"
 
diff --git a/pkgbuilds/shared/claude-code/.SRCINFO b/pkgbuilds/shared/claude-code/.SRCINFO
index 9a13155..8d40670 100644
--- a/pkgbuilds/shared/claude-code/.SRCINFO
+++ b/pkgbuilds/shared/claude-code/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = claude-code
 	pkgdesc = An agentic coding tool that lives in your terminal
-	pkgver = 2.1.86
+	pkgver = 2.1.88
 	pkgrel = 1
 	url = https://github.com/anthropics/claude-code
 	arch = x86_64
@@ -17,9 +17,9 @@ pkgbase = claude-code
 	options = !strip
 	source = cc-legal-20260313::https://code.claude.com/docs/en/legal-and-compliance.md
 	sha256sums = 1e34536633a1b259f36724aa11bd73e6675c1fe3a5072ce57383558278611cba
-	source_x86_64 = claude-2.1.86-x86_64::https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/2.1.86/linux-x64/claude
-	sha256sums_x86_64 = adce02c5f94a85b6ca231c8aeef533707597cd387e8934776455b87d10a3051b
-	source_aarch64 = claude-2.1.86-aarch64::https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/2.1.86/linux-arm64/claude
-	sha256sums_aarch64 = c04aebe3de140679b4cce158812d6f011b7e9c483496ccb0472cf38cc1714afe
+	source_x86_64 = claude-2.1.88-x86_64::https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/2.1.88/linux-x64/claude
+	sha256sums_x86_64 = ced6cac958fa4425b90e6c9341a26731715fcb1a253d5bc0f51c8d5a3a6ab66e
+	source_aarch64 = claude-2.1.88-aarch64::https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases/2.1.88/linux-arm64/claude
+	sha256sums_aarch64 = 2ba4ac149b2198c15e45837fc504146c735fc1e82b9fdf717c2a6b9e0f70c02c
 
 pkgname = claude-code
diff --git a/pkgbuilds/shared/claude-code/PKGBUILD b/pkgbuilds/shared/claude-code/PKGBUILD
index db7d3d5..c3af575 100644
--- a/pkgbuilds/shared/claude-code/PKGBUILD
+++ b/pkgbuilds/shared/claude-code/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Christopher Cooper <christopher@cg505.com>
 # Maintainer: Jérôme Poulin <jeromepoulin@gmail.com>
 pkgname=claude-code
-pkgver=2.1.86
+pkgver=2.1.88
 pkgrel=1
 pkgdesc="An agentic coding tool that lives in your terminal"
 arch=('x86_64' 'aarch64')
@@ -29,8 +29,8 @@ source_x86_64=("claude-${pkgver}-x86_64::${_gcs_bucket}/${pkgver}/linux-x64/clau
 source_aarch64=("claude-${pkgver}-aarch64::${_gcs_bucket}/${pkgver}/linux-arm64/claude")
 
 sha256sums=('1e34536633a1b259f36724aa11bd73e6675c1fe3a5072ce57383558278611cba')
-sha256sums_x86_64=('adce02c5f94a85b6ca231c8aeef533707597cd387e8934776455b87d10a3051b')
-sha256sums_aarch64=('c04aebe3de140679b4cce158812d6f011b7e9c483496ccb0472cf38cc1714afe')
+sha256sums_x86_64=('ced6cac958fa4425b90e6c9341a26731715fcb1a253d5bc0f51c8d5a3a6ab66e')
+sha256sums_aarch64=('2ba4ac149b2198c15e45837fc504146c735fc1e82b9fdf717c2a6b9e0f70c02c')
 
 package() {
 	install -Dm755 "${srcdir}/claude-${pkgver}-${CARCH}" "${pkgdir}/opt/claude-code/bin/claude"
diff --git a/pkgbuilds/shared/github-copilot-cli/.SRCINFO b/pkgbuilds/shared/github-copilot-cli/.SRCINFO
index 253ba6d..6f7a3a1 100644
--- a/pkgbuilds/shared/github-copilot-cli/.SRCINFO
+++ b/pkgbuilds/shared/github-copilot-cli/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = github-copilot-cli
 	pkgdesc = GitHub Copilot CLI brings the power of Copilot coding agent directly to your terminal.
-	pkgver = 1.0.12
+	pkgver = 1.0.13
 	pkgrel = 1
 	url = https://github.com/github/copilot-cli
 	arch = x86_64
@@ -16,14 +16,14 @@ pkgbase = github-copilot-cli
 	conflicts = github-copilot
 	conflicts = github-copilot-cli-legacy
 	replaces = github-copilot
-	noextract = copilot-1.0.12.tgz
+	noextract = copilot-1.0.13.tgz
 	options = !strip
 	options = emptydirs
 	options = staticlibs
 	options = zipman
-	source = https://registry.npmjs.org/@github/copilot/-/copilot-1.0.12.tgz
-	source = CHANGELOG-1.0.12.md::https://raw.githubusercontent.com/github/copilot-cli/v1.0.12/changelog.md
-	b2sums = 9d6f78be31d7541a7a8a6eded1a3480be4fb8619b00d057ff54491d0a3ec05bf9133ec4b07c65d26348b691ec6e36426ce9bad359169feeecf79533091c4a5ee
-	b2sums = 123c807d2494cd4bcee85e9638c7ebdaead824c17db92a87db0c22555f2ae2527fff53307fa35fab82bf05ba0525d9d807f9e76955576c5eaebd042b9cba4019
+	source = https://registry.npmjs.org/@github/copilot/-/copilot-1.0.13.tgz
+	source = CHANGELOG-1.0.13.md::https://raw.githubusercontent.com/github/copilot-cli/v1.0.13/changelog.md
+	b2sums = a1364fe094d6bc369325e20b350941ef04eef6584637b09a076a76b33844b9aa233af9342f936a4f42103aa2ce7fc573f4dbe5958745c8ce9e1175a18e42c32e
+	b2sums = 27bb59f3d98b9e3c6f6ef7cf8d164e2a01030adf8eb72c9a3f0ff3533c2038034a3e14f3df677721bd5b63bafbb947cc4e0a38c8dd09bab5f146af7f3134aaeb
 
 pkgname = github-copilot-cli
diff --git a/pkgbuilds/shared/github-copilot-cli/PKGBUILD b/pkgbuilds/shared/github-copilot-cli/PKGBUILD
index d76d792..882eedf 100644
--- a/pkgbuilds/shared/github-copilot-cli/PKGBUILD
+++ b/pkgbuilds/shared/github-copilot-cli/PKGBUILD
@@ -6,7 +6,7 @@ _npmmodule=@github/copilot
 pkgname=github-copilot-cli
 _pkgexec=copilot
 
-pkgver=1.0.12
+pkgver=1.0.13
 pkgrel=1
 
 pkgdesc="GitHub Copilot CLI brings the power of Copilot coding agent directly to your terminal."
@@ -30,8 +30,8 @@ source=("https://registry.npmjs.org/${_npmmodule}/-/copilot-${pkgver}.tgz"
 		"CHANGELOG-${pkgver}.md::${_urlraw}/changelog.md")
 noextract=("copilot-${pkgver}.tgz")
 
-b2sums=('9d6f78be31d7541a7a8a6eded1a3480be4fb8619b00d057ff54491d0a3ec05bf9133ec4b07c65d26348b691ec6e36426ce9bad359169feeecf79533091c4a5ee'
-        '123c807d2494cd4bcee85e9638c7ebdaead824c17db92a87db0c22555f2ae2527fff53307fa35fab82bf05ba0525d9d807f9e76955576c5eaebd042b9cba4019')
+b2sums=('a1364fe094d6bc369325e20b350941ef04eef6584637b09a076a76b33844b9aa233af9342f936a4f42103aa2ce7fc573f4dbe5958745c8ce9e1175a18e42c32e'
+        '27bb59f3d98b9e3c6f6ef7cf8d164e2a01030adf8eb72c9a3f0ff3533c2038034a3e14f3df677721bd5b63bafbb947cc4e0a38c8dd09bab5f146af7f3134aaeb')
 
 # Document: https://wiki.archlinux.org/title/Node.js_package_guidelines
 package() {