diff --git a/[refs] b/[refs]
index a37d6ebc4ec1..7f22d440dc00 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4728fd21f6d81bb2100da7eb9c675f1a74ad30d
+refs/heads/master: 978b42e6f6f48560b18661a5e187aec7329a094b
diff --git a/trunk/arch/unicore32/Makefile b/trunk/arch/unicore32/Makefile
index 76a8beec7d03..6555abbaeb87 100644
--- a/trunk/arch/unicore32/Makefile
+++ b/trunk/arch/unicore32/Makefile
@@ -75,7 +75,8 @@ endif
 
 boot			:= arch/unicore32/boot
 
-# Default target when executing plain make
+# Default defconfig and target when executing plain make
+KBUILD_DEFCONFIG	:= $(ARCH)_defconfig
 KBUILD_IMAGE		:= zImage
 
 all:	$(KBUILD_IMAGE)
diff --git a/trunk/arch/unicore32/configs/debug_defconfig b/trunk/arch/unicore32/configs/unicore32_defconfig
similarity index 99%
rename from trunk/arch/unicore32/configs/debug_defconfig
rename to trunk/arch/unicore32/configs/unicore32_defconfig
index 9b9c2519a38f..c9dd3198b6f7 100644
--- a/trunk/arch/unicore32/configs/debug_defconfig
+++ b/trunk/arch/unicore32/configs/unicore32_defconfig
@@ -1,6 +1,6 @@
 ### General setup
 CONFIG_EXPERIMENTAL=y
-CONFIG_LOCALVERSION="-debug"
+CONFIG_LOCALVERSION="-unicore32"
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y