diff --git a/Makefile.unix b/Makefile.unix
index 6a7c22997c..504e0dd556 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -529,7 +529,7 @@ savedefconfig: do_savedefconfig
 	$(Q) grep "^CONFIG_ARCH_CHIP_" .config >> defconfig.tmp; true
 	$(Q) grep "CONFIG_ARCH_BOARD=" .config && grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp; true
 	$(Q) grep "^CONFIG_ARCH_CUSTOM" .config && grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp; true
-	$(Q) cat defconfig.tmp | sort | uniq > defconfig
+	$(Q) export LC_ALL=C; cat defconfig.tmp | sort | uniq > defconfig
 	$(Q) rm -f defconfig.tmp
 
 # export
diff --git a/configs/stm32f4discovery/nsh/defconfig b/configs/stm32f4discovery/nsh/defconfig
index 0e269f4b55..a1ea5bd08e 100644
--- a/configs/stm32f4discovery/nsh/defconfig
+++ b/configs/stm32f4discovery/nsh/defconfig
@@ -1,21 +1,20 @@
 # CONFIG_ARCH_FPU is not set
 # CONFIG_NSH_ARGCAT is not set
-# CONFIG_NSH_CMDOPT_DF_H is not set
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 # CONFIG_NSH_CMDPARMS is not set
-CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y
+CONFIG_ARCH="arm"
 CONFIG_ARCH_BOARD="stm32f4discovery"
+CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CHIP_STM32F407VG=y
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH="arm"
 CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 CONFIG_BOARD_LOOPSPERMSEC=16717
 CONFIG_BUILTIN=y
 CONFIG_DISABLE_POLL=y
-CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_EXAMPLES_NSH=y
+CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 CONFIG_FS_PROCFS=y
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y