diff --git a/ChangeLog b/ChangeLog
index d9a8f7a4d2..011bff6d83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1444,3 +1444,9 @@
 	  - Lost SYNACK causes connection reset
 	  - Fix missing UDP stats for sent/received packets
 	  - Added support for Cygwin as development/test platform.
+	* configs/demo9s12ne64 - Integrate new buildroot-1.9 m8s12x toolchain.
+	* 'uname -o' is used throughout the build logic in bash scripts and also in
+	  Make.defs files in order to distinguish between Cygwin and Linux.  However,
+	  the -o option is not standard and is not supported under, for example, OS-X or
+	  Solaris.  This was solved by changing all 'uname -o' references to the more
+	  complex:  'uname -o 2>/dev/null || echo "Other"'
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index aac2bbe3ed..fdaa8e9579 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: January 23, 2011</p>
+      <p>Last Updated: February 10, 2011</p>
     </td>
   </tr>
 </table>
@@ -1992,17 +1992,18 @@ pascal-2.0 2009-12-21 Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
       stdbool.h.  This change was necessary for compatibility
       with NuttX-5.0 (any beyond).
 
-buildroot-1.8 2009-12-21 &lt;spudmonkey@racsa.co.cr&gt;
+buildroot-1.9 2011-02-10 &lt;spudmonkey@racsa.co.cr&gt;
 
-    * configs/cortexm3-defconfig-4.3.3: Added support for NuttX NXFLAT
-      tools.
-    * configs/arm7tdmi-defconfig-4.3.3: Update to arm7tdmi-defconfig-4.2.4.
-      Also builds NuttX NXFLAT tools.
-    * configs/m68hc12-defconfig-4.3.3: Update to m68ch11-defconfig.
-    * configs/m68hc12-defconfig-3.4.6: There are problems building GCC
-      4.3.3 for the hc12.
-    * configs/m32c-defconfig-4.2.4: Added genromfs
-    * configs/m32c-defconfig-4.3.3: Update to m32c-defconfig-4.2.4
+    * configs/arm926t-defconfig-4.3.3: update arm926t-defconfig-4.2.4
+    * configs/arm926t-defconfig-nxflat: NXFLAT-only configuration for
+      arm926
+    * toolchain/gdb/gdb.mk - Remove ncurses dependency from gdb_target target.
+    * toolchain/gdb/gdb.mk - Added --disable-werror to GDB configuration line.
+      GDB 6.8 won't build because the tarbal was released with -Werror enabled and
+      the build stops on the first warning.
+    * Add support for Freescale m9s12x using binutils 2.18 and gcc 3.3.6 and
+      patches available from http://www.msextra.com/tools courtesy of James
+      Cortina.  Add configs/m9x12x-defconfig-3.3.6.
 </pre></ul>
 
 <table width ="100%">
@@ -2020,18 +2021,16 @@ nuttx-5.18 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
       - Lost SYNACK causes connection reset
       - Fix missing UDP stats for sent/received packets
       - Added support for Cygwin as development/test platform.
+    * configs/demo9s12ne64 - Integrate new buildroot-1.9 m8s12x toolchain.
+    * 'uname -o' is used throughout the build logic in bash scripts and also in
+      Make.defs files in order to distinguish between Cygwin and Linux.  However,
+      the -o option is not standard and is not supported under, for example, OS-X or
+      Solaris.  This was solved by changing all 'uname -o' references to the more
+      complex:  'uname -o 2>/dev/null || echo &quot;Other&quot;'
 
-pascal-2.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
+pascal-2.1 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
-buildroot-1.9 2010-xx-xx <spudmonkey@racsa.co.cr>
-
-    * configs/arm926t-defconfig-4.3.3: update arm926t-defconfig-4.2.4
-    * configs/arm926t-defconfig-nxflat: NXFLAT-only configuration for
-      arm926
-    * toolchain/gdb/gdb.mk - Remove ncurses dependency from gdb_target target.
-    * toolchain/gdb/gdb.mk - Added --disable-werror to GDB configuration line.
-      GDB 6.8 won't build because the tarball was released with -Werror enabled and
-      the build stops on the first warning.
+buildroot-1.10 2011-xx-xx <spudmonkey@racsa.co.cr>
 
 </pre></ul>
 
diff --git a/configs/mcu123-lpc214x/nsh/Make.defs b/configs/mcu123-lpc214x/nsh/Make.defs
index b869bec359..2cdf1e0116 100644
--- a/configs/mcu123-lpc214x/nsh/Make.defs
+++ b/configs/mcu123-lpc214x/nsh/Make.defs
@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/mcu123-lpc214x/nsh/Make.defs
 #
-#   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@ NM			= $(CROSSDEV)nm
 OBJCOPY			= $(CROSSDEV)objcopy
 OBJDUMP			= $(CROSSDEV)objdump
 
-HOSTOS			=  ${shell uname -o}
+HOSTOS			=  ${shell uname -o 2>/dev/null || echo "Other"}
 
 ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
diff --git a/configs/mcu123-lpc214x/ostest/Make.defs b/configs/mcu123-lpc214x/ostest/Make.defs
index b2f12b6774..ce5c685d75 100644
--- a/configs/mcu123-lpc214x/ostest/Make.defs
+++ b/configs/mcu123-lpc214x/ostest/Make.defs
@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/mcu123-lpc214x/ostest/Make.defs
 #
-#   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2009, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@ NM			= $(CROSSDEV)nm
 OBJCOPY			= $(CROSSDEV)objcopy
 OBJDUMP			= $(CROSSDEV)objdump
 
-HOSTOS			=  ${shell uname -o}
+HOSTOS			=  ${shell uname -o 2>/dev/null || echo "Other"}
 
 ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
diff --git a/configs/mcu123-lpc214x/usbserial/Make.defs b/configs/mcu123-lpc214x/usbserial/Make.defs
index f572099b8a..dcea1189b4 100644
--- a/configs/mcu123-lpc214x/usbserial/Make.defs
+++ b/configs/mcu123-lpc214x/usbserial/Make.defs
@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/mcu123-lpc214x/usbserial/Make.defs
 #
-#   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@ NM			= $(CROSSDEV)nm
 OBJCOPY			= $(CROSSDEV)objcopy
 OBJDUMP			= $(CROSSDEV)objdump
 
-HOSTOS			=  ${shell uname -o}
+HOSTOS			=  ${shell uname -o 2>/dev/null || echo "Other"}
 
 ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
diff --git a/configs/mcu123-lpc214x/usbstorage/Make.defs b/configs/mcu123-lpc214x/usbstorage/Make.defs
index 8640374922..6167faa265 100644
--- a/configs/mcu123-lpc214x/usbstorage/Make.defs
+++ b/configs/mcu123-lpc214x/usbstorage/Make.defs
@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/mcu123-lpc214x/usbstorage/Make.defs
 #
-#   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@ NM			= $(CROSSDEV)nm
 OBJCOPY			= $(CROSSDEV)objcopy
 OBJDUMP			= $(CROSSDEV)objdump
 
-HOSTOS			=  ${shell uname -o}
+HOSTOS			=  ${shell uname -o 2>/dev/null || echo "Other"}
 
 ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
diff --git a/configs/olimex-strp711/nettest/Make.defs b/configs/olimex-strp711/nettest/Make.defs
index 391691e8f1..718a938519 100755
--- a/configs/olimex-strp711/nettest/Make.defs
+++ b/configs/olimex-strp711/nettest/Make.defs
@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/olimex-strp711/nettest/Make.defs
 #
-#   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2010-2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@ NM			= $(CROSSDEV)nm
 OBJCOPY			= $(CROSSDEV)objcopy
 OBJDUMP			= $(CROSSDEV)objdump
 
-HOSTOS			=  ${shell uname -o}
+HOSTOS			=  ${shell uname -o 2>/dev/null || echo "Other"}
 
 ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
diff --git a/configs/olimex-strp711/nsh/Make.defs b/configs/olimex-strp711/nsh/Make.defs
index 3cff99873e..094b6c2392 100644
--- a/configs/olimex-strp711/nsh/Make.defs
+++ b/configs/olimex-strp711/nsh/Make.defs
@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/olimex-strp711/nsh/Make.defs
 #
-#   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@ NM			= $(CROSSDEV)nm
 OBJCOPY			= $(CROSSDEV)objcopy
 OBJDUMP			= $(CROSSDEV)objdump
 
-HOSTOS			=  ${shell uname -o}
+HOSTOS			=  ${shell uname -o 2>/dev/null || echo "Other"}
 
 ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
diff --git a/configs/olimex-strp711/ostest/Make.defs b/configs/olimex-strp711/ostest/Make.defs
index 1fdfb750dd..498fdf52dc 100644
--- a/configs/olimex-strp711/ostest/Make.defs
+++ b/configs/olimex-strp711/ostest/Make.defs
@@ -1,7 +1,7 @@
 ##############################################################################
 # configs/olimex-strp711/ostest/Make.defs
 #
-#   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,7 @@ NM			= $(CROSSDEV)nm
 OBJCOPY			= $(CROSSDEV)objcopy
 OBJDUMP			= $(CROSSDEV)objdump
 
-HOSTOS			=  ${shell uname -o}
+HOSTOS			=  ${shell uname -o 2>/dev/null || echo "Other"}
 
 ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
 ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
diff --git a/configs/olimex-strp711/scripts/oocd.sh b/configs/olimex-strp711/scripts/oocd.sh
index 556d977980..f0ba817618 100755
--- a/configs/olimex-strp711/scripts/oocd.sh
+++ b/configs/olimex-strp711/scripts/oocd.sh
@@ -2,7 +2,7 @@
 
 # Set up pathes to binaries, scripts, configuration files
 
-hostos=`uname -o`
+hostos=`uname -o 2>/dev/null || echo "Other"`
 if [ "X${hostos}" = "XCygwin" ]; then
 	installdir=/cygdrive/c/gccfd/openocd/bin
 	ft2exe=$installdir/openocd-ftd2xx.exe
diff --git a/configs/sim/mount/Make.defs b/configs/sim/mount/Make.defs
index 4bad4c1835..ea1921f185 100644
--- a/configs/sim/mount/Make.defs
+++ b/configs/sim/mount/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sim/mount/Make.defs
 #
-#   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 include ${TOPDIR}/.config
 
-HOSTOS			= ${shell uname -o}
+HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION	= -g
diff --git a/configs/sim/nettest/Make.defs b/configs/sim/nettest/Make.defs
index d00f5e923b..087debc1e4 100644
--- a/configs/sim/nettest/Make.defs
+++ b/configs/sim/nettest/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sim/Make.defs
 #
-#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 include ${TOPDIR}/.config
 
-HOSTOS			= ${shell uname -o}
+HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION	= -g
diff --git a/configs/sim/nsh/Make.defs b/configs/sim/nsh/Make.defs
index 163224b7af..74086dccd9 100644
--- a/configs/sim/nsh/Make.defs
+++ b/configs/sim/nsh/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sim/nsh/Make.defs
 #
-#   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 include ${TOPDIR}/.config
 
-HOSTOS			= ${shell uname -o}
+HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION	= -g
diff --git a/configs/sim/nx/Make.defs b/configs/sim/nx/Make.defs
index 2c5ae3ced1..47ebec1010 100644
--- a/configs/sim/nx/Make.defs
+++ b/configs/sim/nx/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sim/nx/Make.defs
 #
-#   Copyright (C) 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 include ${TOPDIR}/.config
 
-HOSTOS			= ${shell uname -o}
+HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION	= -g
diff --git a/configs/sim/ostest/Make.defs b/configs/sim/ostest/Make.defs
index d00f5e923b..087debc1e4 100644
--- a/configs/sim/ostest/Make.defs
+++ b/configs/sim/ostest/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sim/Make.defs
 #
-#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 include ${TOPDIR}/.config
 
-HOSTOS			= ${shell uname -o}
+HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION	= -g
diff --git a/configs/sim/pashello/Make.defs b/configs/sim/pashello/Make.defs
index 7060ae542b..0ec9e909b1 100644
--- a/configs/sim/pashello/Make.defs
+++ b/configs/sim/pashello/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sim/pashello/Make.defs
 #
-#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 include ${TOPDIR}/.config
 
-HOSTOS			= ${shell uname -o}
+HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   ARCHOPTIMIZATION	= -g
diff --git a/tools/incdir.sh b/tools/incdir.sh
index 447151ed30..e520ca21f8 100755
--- a/tools/incdir.sh
+++ b/tools/incdir.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # tools/incdir.sh
 #
-#   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -109,7 +109,7 @@ fi
 # toolchains, we have to use the full windows-style paths to the header
 # files.
 
-os=`uname -o`
+os=`uname -o 2>/dev/null || echo "Other"`
 
 # Let's assume that all GCC compiler paths contain the string gcc and
 # no non-GCC compiler pathes include this substring