diff --git a/ChangeLog b/ChangeLog
index 257119a353258285122886175ccec89a41e2e696..7121c506f189e46d03be042d4292c55e69e49a5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3465,3 +3465,8 @@
 	  of CONFIG_EXAMPLE_* to CONFIG_EXAMPLES_*.
 	* drivers/mtd/w25.c and configs/*/src/up_w25.c:  Several fixes for the
 	  W25 SPI FLASH.
+	* configs/*/Make.defs:  All buildroot tools now use the extension
+	  xxx-nuttx-elf- vs. xxx-elf-
+	* configs/shenzhou/*/Make.defs:  Now uses the new buildroot 4.6.3
+	  EABI toolchain.
+
diff --git a/configs/shenzhou/README.txt b/configs/shenzhou/README.txt
index 1f3f254aabab1787e768a500d3114f960417319b..cad0ad2e73c98f1a751d726fa43285f28c5f8ba9 100644
--- a/configs/shenzhou/README.txt
+++ b/configs/shenzhou/README.txt
@@ -354,7 +354,7 @@ NuttX buildroot Toolchain
 
   4. cd <some-dir>/buildroot
 
-  5. cp configs/cortexm3-defconfig-4.3.3 .config
+  5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config
 
   6. make oldconfig
 
@@ -770,4 +770,4 @@ Where <subdir> is one of the following:
 
       -CONFIG_NX_WRITEONLY=y
       +# CONFIG_NX_WRITEONLY is not set
- 
\ No newline at end of file
+ 
diff --git a/configs/shenzhou/nsh/Make.defs b/configs/shenzhou/nsh/Make.defs
index 95495d4c434aab87279abd6b44c77128b95b9a06..317a95cda8768ee6035644adc697319e332e3600 100644
--- a/configs/shenzhou/nsh/Make.defs
+++ b/configs/shenzhou/nsh/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -153,7 +153,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-eabi-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/shenzhou/nxwm/Make.defs b/configs/shenzhou/nxwm/Make.defs
index 96e0ffd4b217f0b1b47b138b5d315205fe5b3315..96104d6d0c8f8d5b13bf5e5b2211a544f7d95127 100644
--- a/configs/shenzhou/nxwm/Make.defs
+++ b/configs/shenzhou/nxwm/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-nuttx-elf-
-  ARCROSSDEV = arm-nuttx-elf-
+  CROSSDEV = arm-nuttx-eabi-
+  ARCROSSDEV = arm-nuttx-eabi-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -153,7 +153,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-eabi-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)