diff --git a/helpers/envkernel.sh b/helpers/envkernel.sh
index d441fc2d..a40e1484 100644
--- a/helpers/envkernel.sh
+++ b/helpers/envkernel.sh
@@ -195,6 +195,12 @@ set_alias_make() {
 	fi
 	cmd="$cmd make -C /mnt/linux O=/mnt/linux/.output"
 	cmd="$cmd CC=$cc HOSTCC=$hostcc"
+
+	# Avoid "+" suffix in kernel version if the working directory is dirty.
+	# (Otherwise we will generate a package that uses different paths...)
+	# Note: Set CONFIG_LOCALVERSION_AUTO=n in kernel config additionally
+	cmd="$cmd LOCALVERSION="
+
 	# shellcheck disable=SC2139
 	alias make="$cmd"
 	unset cmd