diff --git a/[refs] b/[refs]
index cfad222dddf3..bdea9cb1f2ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09155120cf0ffe6f0c8aba3aa625831405b65996
+refs/heads/master: 0a564b2645c8766a669c55bde1f1ef5b0518caec
diff --git a/trunk/Makefile b/trunk/Makefile
index a86ac8c4798e..12ab17511308 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -884,11 +884,9 @@ $(vmlinux-dirs): prepare scripts
 	$(Q)$(MAKE) $(build)=$@
 
 # Store (new) KERNELRELASE string in include/config/kernel.release
-localversion = $(shell $(CONFIG_SHELL) \
-	       $(srctree)/scripts/setlocalversion $(srctree))
 include/config/kernel.release: include/config/auto.conf FORCE
 	$(Q)rm -f $@
-	$(Q)echo $(KERNELVERSION)$(localversion) > $@
+	$(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@
 
 
 # Things we need to do before we recursively start building the kernel