destroy dirty tag and scm version once and for all
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 857ea4f..4090d4b 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -91,7 +91,7 @@
 
 		# Check for uncommitted changes
 		if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then
-			printf '%s' -dirty
+			printf '%s'
 		fi
 
 		# All done with git
@@ -115,7 +115,7 @@
 		# Are there uncommitted changes?
 		# These are represented by + after the changeset id.
 		case "$hgid" in
-			*+|*+\ *) printf '%s' -dirty ;;
+			*+|*+\ *) printf '%s' ;;
 		esac
 
 		# All done with mercurial
@@ -176,7 +176,7 @@
 # scm version string if not at a tagged commit
 if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then
 	# full scm version string
-	res="$res$(scm_version)"
+	res="$res"
 else
 	# append a plus sign if the repository is not in a clean
 	# annotated or signed tagged state (as git describe only
@@ -184,7 +184,7 @@
 	# LOCALVERSION= is not specified
 	if test "${LOCALVERSION+set}" != "set"; then
 		scm=$(scm_version --short)
-		res="$res${scm:++}"
+		res="$res"
 	fi
 fi