diff --git a/[refs] b/[refs]
index 87334a398de8..f0fb037bce6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c938663d58b5b2965976a6f54cc51b5d6f691aa
+refs/heads/master: d5eda75f3a6a08f5a3644764a88d288e62e7823d
diff --git a/trunk/Makefile b/trunk/Makefile
index 993d1f335925..324130c682dd 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -944,7 +944,7 @@ ifdef CONFIG_LOCALVERSION_AUTO
 	localver-extra = $(scm-identifier)
 else
 	ifneq ($(scm-identifier),)
-		ifeq ($(LOCALVERSION),)
+		ifeq ("$(origin LOCALVERSION)", "undefined")
 			localver-extra = +
 		endif
 	endif