diff --git a/configs/Kconfig b/configs/Kconfig
index 77c691cfcae..f8470bc948a 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -367,7 +367,7 @@ config ARCH_BOARD_PJRC_87C52
 
 config ARCH_BOARD_QEMU_I486
 	bool "Qemu i486 Mode"
-	depends on ARCH_QEMU
+	depends on ARCH_X86 || ARCH_I486
 	---help---
 		Port of NuttX to QEMU in i486 mode.  This port will also run on real i486
 		hardwared (Google the Bifferboard).
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index e514da1f429..8fb1fff89f1 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -43,6 +43,7 @@ CONFIG_ARCH_CHIP_QEMU=y
 CONFIG_ARCH_BOARD="qemu-i486"
 CONFIG_ARCH_BOARD_QEMU_I486=y
 CONFIG_BOARD_LOOPSPERMSEC=999
+CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_DRAM_SIZE=1048576
 CONFIG_DRAM_START=0x00100000
 CONFIG_ARCH_NOINTC=n
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index 52b8ae80cbb..0fa5f5cb6db 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -43,6 +43,7 @@ CONFIG_ARCH_CHIP_QEMU=y
 CONFIG_ARCH_BOARD="qemu-i486"
 CONFIG_ARCH_BOARD_QEMU_I486=y
 CONFIG_BOARD_LOOPSPERMSEC=999
+CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_DRAM_SIZE=1048576
 CONFIG_DRAM_START=0x00100000
 CONFIG_ARCH_NOINTC=n
diff --git a/configs/shenzhou/nsh/Make.defs b/configs/shenzhou/nsh/Make.defs
index dd3db80deaa..130c73f6dea 100644
--- a/configs/shenzhou/nsh/Make.defs
+++ b/configs/shenzhou/nsh/Make.defs
@@ -88,7 +88,13 @@ ifeq ($(CONFIG_STM32_BUILDROOT),y)
   MAXOPTIMIZATION = -Os
 endif
 
-LDSCRIPT = ld.script
+# Pick the linker script
+
+ifeq ($(CONFIG_STM32_DFU),y)
+  LDSCRIPT = ld.script.dfu
+else
+  LDSCRIPT = ld.script
+endif
 
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
diff --git a/configs/shenzhou/scripts/ld.script b/configs/shenzhou/scripts/ld.script
index fc4dfbd6b77..14f924baec0 100644
--- a/configs/shenzhou/scripts/ld.script
+++ b/configs/shenzhou/scripts/ld.script
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-/* The STM32F107VC has 256Kb of FLASH beginning at address 0x0800:0000 and
- * 64Kb of SRAM beginning at address 0x2000:0000.
+/* The STM32F107VC has 256K of FLASH beginning at address 0x0800:0000 and
+ * 64K of SRAM beginning at address 0x2000:0000.
  */
 
 MEMORY
diff --git a/configs/shenzhou/scripts/ld.script.dfu b/configs/shenzhou/scripts/ld.script.dfu
index 80494bc7b0b..53e3ee4fca1 100644
--- a/configs/shenzhou/scripts/ld.script.dfu
+++ b/configs/shenzhou/scripts/ld.script.dfu
@@ -33,10 +33,10 @@
  *
  ****************************************************************************/
 
-/* The STM32F107VC has 256Kb of FLASH beginning at address 0x0800:0000 and
- * 64Kb of SRAM beginning at address 0x2000:0000.  Here we assume that the
+/* The STM32F107VC has 256K of FLASH beginning at address 0x0800:0000 and
+ * 64K of SRAM beginning at address 0x2000:0000.  Here we assume that the
  * STMicro DFU bootloader is being used.  In that case, the corrct load .text
- * load address is 0x08003000 (leaving 464Kb).
+ * load address is 0x08003000 (leaving 208K).
  */
 
 MEMORY