diff --git a/arch/unicore32/Makefile b/arch/unicore32/Makefile
index 76a8beec7d03e454d49e9da70a6c6dbc734566ef..6555abbaeb87595482a8f49179c28700ad3e9d1b 100644
--- a/arch/unicore32/Makefile
+++ b/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/arch/unicore32/configs/debug_defconfig b/arch/unicore32/configs/unicore32_defconfig
similarity index 99%
rename from arch/unicore32/configs/debug_defconfig
rename to arch/unicore32/configs/unicore32_defconfig
index 9b9c2519a38fea8218645a2edab04beb047b7e68..c9dd3198b6f701d3e07b50c81528fb240da7b9ca 100644
--- a/arch/unicore32/configs/debug_defconfig
+++ b/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