diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh
index 2f0dab26dace944..7f8ffe7c55cd731 100755
--- a/scripts/lint-packages.sh
+++ b/scripts/lint-packages.sh
@@ -123,9 +123,9 @@ check_indentation() {
 
 # We'll need the 'origin/master' as a base commit when running the version check.
 # So try fetching it now if it doesn't exist.
-if ! base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"; then
+if ! base_commit="HEAD~$(git rev-list --no-merges --count FETCH_HEAD..)"; then
 	git fetch https://github.com/termux/termux-packages.git
-	base_commit="HEAD~$(git rev-list --count FETCH_HEAD..)"
+	base_commit="HEAD~$(git rev-list --no-merges --count FETCH_HEAD..)"
 fi
 
 check_version() {
@@ -155,7 +155,7 @@ check_version() {
 		}
 
 		# Was the package modified in this branch?
-		git diff --exit-code "${base_commit}" -- "${package_dir}" &> /dev/null && {
+		git diff --no-merges --exit-code "${base_commit}" -- "${package_dir}" &> /dev/null && {
 			printf '%s\n' "PASS - ${version} (not modified in this branch)"
 			continue
 		}
@@ -226,7 +226,11 @@ check_version() {
 				"" \
 				"TERMUX_PKG_VERSION was bumped but TERMUX_PKG_REVISION wasn't reset." \
 				"Please remove the 'TERMUX_PKG_REVISION=${new_revision}' line." \
-				""
+				"base_commit: $base_commit" \
+				"HEAD commit hash: $(git rev-parse HEAD)" \
+				"git status: $(git status)" \
+				"git diff --no-merges: $(git diff --no-merges --exit-code "${base_commit}" -- "${package_dir}")" \
+				"git log: $(git log)"
 			continue
 		fi
 
diff --git a/x11-packages/iso-codes/build.sh b/x11-packages/iso-codes/build.sh
index e82dc887f96ab4b..251d3b7147e4bb5 100644
--- a/x11-packages/iso-codes/build.sh
+++ b/x11-packages/iso-codes/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Lists of the country, language, and currency names"
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="4.19.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://salsa.debian.org/iso-codes-team/iso-codes/-/archive/v${TERMUX_PKG_VERSION}/iso-codes-v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4b143a891feb7d1bb64e44fe3ef253ef36ba1185d1d129c1425338dc6e46e27d
 TERMUX_PKG_AUTO_UPDATE=true