diff --git a/configs/qemu-i486/README.txt b/configs/qemu-i486/README.txt
index 9065915344..254f8a1314 100644
--- a/configs/qemu-i486/README.txt
+++ b/configs/qemu-i486/README.txt
@@ -137,7 +137,11 @@ FAQ
 ===
 
 Q: I get the following error message, "undefined reference to '__stack_chk_fail'"
-A: Add -fno-stack-protector to ARCHCPUFLAGS in you Make.defs file.
+A: Add -fno-stack-protector to ARCHCPUFLAGS in you Make.defs file.  Switch the
+   commenting on the following two lines in the Make.defs file:
+
+   ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin
+   #ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector
 
 Configurations
 ==============
diff --git a/configs/qemu-i486/nsh/Make.defs b/configs/qemu-i486/nsh/Make.defs
index 8a30d09fd8..d18c802931 100644
--- a/configs/qemu-i486/nsh/Make.defs
+++ b/configs/qemu-i486/nsh/Make.defs
@@ -61,6 +61,7 @@ else
 endif
 
 ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin
+#ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector
 ARCHPICFLAGS = -fpic
 ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
 ARCHDEFINES =
diff --git a/configs/qemu-i486/ostest/Make.defs b/configs/qemu-i486/ostest/Make.defs
index 4cd8f57747..5851427e65 100644
--- a/configs/qemu-i486/ostest/Make.defs
+++ b/configs/qemu-i486/ostest/Make.defs
@@ -61,6 +61,7 @@ else
 endif
 
 ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin
+#ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector
 ARCHPICFLAGS = -fpic
 ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
 ARCHDEFINES =