diff --git a/CHANGELOG.md b/CHANGELOG.md
index 743d6466fa..89e2af73a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,7 @@
 
 - **decompress:** Disable progress bar to improve `Expand-Archive` performance ([#5410](https://github.com/ScoopInstaller/Scoop/issues/5410))
 - **scoop-search:** Improve performance for local search ([#5324](https://github.com/ScoopInstaller/Scoop/issues/5324))
+- **shim:** Update kiennq-shim to v3.1 ([#5841](https://github.com/ScoopInstaller/Scoop/issues/5841))
 
 ### Code Refactoring
 
diff --git a/supporting/shims/kiennq/.gitignore b/supporting/shims/kiennq/.gitignore
deleted file mode 100644
index 41cfea69b4..0000000000
--- a/supporting/shims/kiennq/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.zip
-*.bak
diff --git a/supporting/shims/kiennq/Makefile b/supporting/shims/kiennq/Makefile
deleted file mode 100644
index 1610fc723c..0000000000
--- a/supporting/shims/kiennq/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-
-VER?=2.2.1
-ZIP=shimexe.zip
-URL?=https://github.com/kiennq/scoop-better-shimexe/releases/download/$(VER)/$(ZIP)
-LATEST_URL?=https://github.com/kiennq/scoop-better-shimexe/releases/latest
-NEWVER=$(shell cat version.txt)
-
-all: verify ## make download unzip verify
-
-version.txt:
-	@curl --max-redirs 0 -s -D - -o /dev/null $(LATEST_URL) | grep -i ^location | sed -E -e "s|.*/([^/]+)$$|\1|" >version.txt
-	@printf "%s " "Latest version is:"
-	@cat version.txt
-
-check: version.txt ## Check the version number in version.txt and update if needed
-
-bump: check ## Bump version number in Makefile
-	@rm -f Makefile.bak
-	@sed -i.bak -e 's|=$(VER)|=$(NEWVER)|' Makefile
-	@cmp --quiet Makefile{,.bak} || echo "Makefile bumped from $(VER) to $(NEWVER)"
-
-$(ZIP): version.txt
-	curl -L -s -o $(ZIP) $(URL)
-	@touch $@
-
-download: $(ZIP)  ## Download shim from https://github.com/kiennq/scoop-better-shimexe
-
-shim.exe: $(ZIP)
-	unzip -z -j -o $(ZIP)
-	@touch $@
-
-unzip: shim.exe ## Unzip download
-
-verify: shim.exe ## Verify SHA256 checksum for shim.exe
-	sed -e "s|bin/||" checksum.sha256 | sha256sum -c
-
-clean: ## Clean .zip files
-	rm -f *.zip
-
-help: ## Display help text
-	@printf "%-8s %s\n" Target Description
-	@printf "%-8s %s\n" '--------' '------------------------------------------'
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "%-8s %s\n", $$1, $$2}'
-
-.PHONY: all
-.PHONY: bump
-.PHONY: check
-.PHONY: clean
-.PHONY: download
-.PHONY: help
-.PHONY: unzip
-.PHONY: verify
diff --git a/supporting/shims/kiennq/checksum.sha256 b/supporting/shims/kiennq/checksum.sha256
index 32944ff856..07541e9e10 100644
--- a/supporting/shims/kiennq/checksum.sha256
+++ b/supporting/shims/kiennq/checksum.sha256
@@ -1 +1 @@
-aa685053f4a5c0e7145f2a27514c8a56ceae25b0824062326f04037937caa558  bin/shim.exe
+554aac610eae2cd61cae3dea0c66fd8283e95eb9c4af5dd9e591197c6a28e119 *shim.exe
diff --git a/supporting/shims/kiennq/checksum.sha512 b/supporting/shims/kiennq/checksum.sha512
index c7014db2a0..2a9352b80e 100644
--- a/supporting/shims/kiennq/checksum.sha512
+++ b/supporting/shims/kiennq/checksum.sha512
@@ -1 +1 @@
-67c605c8163869d8ef8153c64eb09b82645cbae8228928c0fef944d0259a7b2d3791ecf4b4b01e23566916a878ee7977bfc1a59846bccf3c63bd6a1cf4f521b5  bin/shim.exe
+88bba1bbe84a1cc0c2492e7c87d761ea449ce80818d619b763f2c6391e114992864e1cf7cd3121350c0bae20bd48a834e56a304d35e8fabcf2dfee58b223e841 *shim.exe
diff --git a/supporting/shims/kiennq/shim.exe b/supporting/shims/kiennq/shim.exe
index 743c9f1059..96994d71dc 100644
Binary files a/supporting/shims/kiennq/shim.exe and b/supporting/shims/kiennq/shim.exe differ
diff --git a/supporting/shims/kiennq/version.txt b/supporting/shims/kiennq/version.txt
index c043eea776..861668947a 100644
--- a/supporting/shims/kiennq/version.txt
+++ b/supporting/shims/kiennq/version.txt
@@ -1 +1 @@
-2.2.1
+v3.1