diff --git a/lib/Makefile b/lib/Makefile
index c7cf965a6c2..b72415b6e17 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -34,6 +34,7 @@
 ###########################################################################
 
 -include $(TOPDIR)/Make.defs
+include stdio/Make.defs
 include string/Make.defs
 
 ASRCS = 
@@ -46,28 +47,6 @@ endif
 
 CTYPE_SRCS = 
 
-STDIO_SRCS = lib_fileno.c lib_printf.c lib_rawprintf.c lib_lowprintf.c \
-		  lib_sprintf.c lib_snprintf.c lib_libsprintf.c lib_vsprintf.c \
-		  lib_vsnprintf.c lib_libvsprintf.c lib_meminstream.c \
-		  lib_memoutstream.c lib_lowinstream.c lib_lowoutstream.c \
-		  lib_zeroinstream.c lib_nullinstream.c lib_nulloutstream.c \
-		  lib_sscanf.c
-
-ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
-STDIO_SRCS += lib_rawinstream.c lib_rawoutstream.c
-ifneq ($(CONFIG_NFILE_STREAMS),0)
-STDIO_SRCS += lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fseek.c \
-		   lib_ftell.c lib_fsetpos.c lib_fgetpos.c lib_fgetc.c lib_fgets.c \
-		   lib_gets.c lib_fwrite.c lib_libfwrite.c lib_fflush.c \
-		   lib_libflushall.c lib_libfflush.c lib_rdflush.c lib_wrflush.c \
-		   lib_fputc.c lib_puts.c lib_fputs.c lib_ungetc.c lib_vprintf.c \
-		   lib_fprintf.c lib_vfprintf.c lib_stdinstream.c lib_stdoutstream.c
-endif
-endif
-ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
-STDIO_SRCS += lib_dtoa.c
-endif
-
 STDLIB_SRCS = lib_abs.c lib_imaxabs.c lib_labs.c lib_llabs.c lib_rand.c lib_qsort.c
 
 MATH_SRCS = lib_rint.c lib_fixedmath.c lib_b16sin.c lib_b16cos.c
@@ -107,8 +86,9 @@ SRCS = $(ASRCS) $(CSRCS)
 OBJS = $(AOBJS) $(COBJS)
 
 ROOTDEPPATH	= --dep-path .
+STDIODEPPATH = --dep-path stdio
 STRINGDEPPATH = --dep-path string
-VPATH = string
+VPATH = stdio:string
 
 BIN = liblib$(LIBEXT)
 
@@ -126,7 +106,7 @@ $(BIN):	$(OBJS)
 	done ; )
 
 .depend: Makefile $(SRCS)
-	@$(MKDEP) $(ROOTDEPPATH) $(STRINGDEPPATH) \
+	@$(MKDEP) $(ROOTDEPPATH) $(STRINGDEPPATH) $(STDIODEPPATH) \
 	  $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
 	@touch $@
 
diff --git a/lib/stdio/Make.defs b/lib/stdio/Make.defs
new file mode 100644
index 00000000000..9478369f3ce
--- /dev/null
+++ b/lib/stdio/Make.defs
@@ -0,0 +1,56 @@
+############################################################################
+# lib/stdio/Make.defs
+#
+#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+############################################################################
+
+STDIO_SRCS = lib_fileno.c lib_printf.c lib_rawprintf.c lib_lowprintf.c \
+		  lib_sprintf.c lib_snprintf.c lib_libsprintf.c lib_vsprintf.c \
+		  lib_vsnprintf.c lib_libvsprintf.c lib_meminstream.c \
+		  lib_memoutstream.c lib_lowinstream.c lib_lowoutstream.c \
+		  lib_zeroinstream.c lib_nullinstream.c lib_nulloutstream.c \
+		  lib_sscanf.c
+
+ifneq ($(CONFIG_NFILE_DESCRIPTORS),0)
+STDIO_SRCS += lib_rawinstream.c lib_rawoutstream.c
+ifneq ($(CONFIG_NFILE_STREAMS),0)
+STDIO_SRCS += lib_fopen.c lib_fclose.c lib_fread.c lib_libfread.c lib_fseek.c \
+		   lib_ftell.c lib_fsetpos.c lib_fgetpos.c lib_fgetc.c lib_fgets.c \
+		   lib_gets.c lib_fwrite.c lib_libfwrite.c lib_fflush.c \
+		   lib_libflushall.c lib_libfflush.c lib_rdflush.c lib_wrflush.c \
+		   lib_fputc.c lib_puts.c lib_fputs.c lib_ungetc.c lib_vprintf.c \
+		   lib_fprintf.c lib_vfprintf.c lib_stdinstream.c lib_stdoutstream.c
+endif
+endif
+ifeq ($(CONFIG_LIBC_FLOATINGPOINT),y)
+STDIO_SRCS += lib_dtoa.c
+endif
diff --git a/lib/lib_dtoa.c b/lib/stdio/lib_dtoa.c
similarity index 99%
rename from lib/lib_dtoa.c
rename to lib/stdio/lib_dtoa.c
index 08904d9dfb6..942ed2033ac 100755
--- a/lib/lib_dtoa.c
+++ b/lib/stdio/lib_dtoa.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * lib/lib_dtoa.c
+ * lib/stdio/lib_dtoa.c
  *
  * This file was ported to NuttX by Yolande Cates.
  *
diff --git a/lib/lib_fclose.c b/lib/stdio/lib_fclose.c
similarity index 96%
rename from lib/lib_fclose.c
rename to lib/stdio/lib_fclose.c
index 218b38080c1..4a9ded90b91 100644
--- a/lib/lib_fclose.c
+++ b/lib/stdio/lib_fclose.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fclose.c
+ * lib/stdio/lib_fclose.c
  *
- *   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
diff --git a/lib/lib_fflush.c b/lib/stdio/lib_fflush.c
similarity index 97%
rename from lib/lib_fflush.c
rename to lib/stdio/lib_fflush.c
index 0e46edce34b..c77ab686a9b 100644
--- a/lib/lib_fflush.c
+++ b/lib/stdio/lib_fflush.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fflush.c
+ * lib/stdio/lib_fflush.c
  *
- *   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
diff --git a/lib/lib_fgetc.c b/lib/stdio/lib_fgetc.c
similarity index 97%
rename from lib/lib_fgetc.c
rename to lib/stdio/lib_fgetc.c
index 01801b850b9..58a199724f6 100644
--- a/lib/lib_fgetc.c
+++ b/lib/stdio/lib_fgetc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fgetc.c
+ * lib/stdio/lib_fgetc.c
  *
- *   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
diff --git a/lib/lib_fgetpos.c b/lib/stdio/lib_fgetpos.c
similarity index 97%
rename from lib/lib_fgetpos.c
rename to lib/stdio/lib_fgetpos.c
index e9147681330..a641db4814c 100644
--- a/lib/lib_fgetpos.c
+++ b/lib/stdio/lib_fgetpos.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fgetpos.c
+ * lib/stdio/lib_fgetpos.c
  *
- *   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
diff --git a/lib/lib_fgets.c b/lib/stdio/lib_fgets.c
similarity index 99%
rename from lib/lib_fgets.c
rename to lib/stdio/lib_fgets.c
index 67d553c57b4..3f72f00005a 100644
--- a/lib/lib_fgets.c
+++ b/lib/stdio/lib_fgets.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fgets.c
+ * lib/stdio/lib_fgets.c
  *
- *   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
diff --git a/lib/lib_fileno.c b/lib/stdio/lib_fileno.c
similarity index 96%
rename from lib/lib_fileno.c
rename to lib/stdio/lib_fileno.c
index 1f33cd8f49d..2fe3d9c995a 100644
--- a/lib/lib_fileno.c
+++ b/lib/stdio/lib_fileno.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fileno.c
+ * lib/stdio/lib_fileno.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 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
diff --git a/lib/lib_fopen.c b/lib/stdio/lib_fopen.c
similarity index 99%
rename from lib/lib_fopen.c
rename to lib/stdio/lib_fopen.c
index e198ce88834..07437161c96 100644
--- a/lib/lib_fopen.c
+++ b/lib/stdio/lib_fopen.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * lib/lib_fopen.c
+ * lib/stdio/lib_fopen.c
  *
  *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
diff --git a/lib/lib_fprintf.c b/lib/stdio/lib_fprintf.c
similarity index 97%
rename from lib/lib_fprintf.c
rename to lib/stdio/lib_fprintf.c
index 72d3c9accad..4ebb3d7d2dc 100644
--- a/lib/lib_fprintf.c
+++ b/lib/stdio/lib_fprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fprintf.c
+ * lib/stdio/lib_fprintf.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/lib/lib_fputc.c b/lib/stdio/lib_fputc.c
similarity index 97%
rename from lib/lib_fputc.c
rename to lib/stdio/lib_fputc.c
index 56ac536c2b9..f5eeecea77c 100644
--- a/lib/lib_fputc.c
+++ b/lib/stdio/lib_fputc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fputc.c
+ * lib/stdio/lib_fputc.c
  *
- *   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
diff --git a/lib/lib_fputs.c b/lib/stdio/lib_fputs.c
similarity index 97%
rename from lib/lib_fputs.c
rename to lib/stdio/lib_fputs.c
index 8c4e6d772ef..870c5c42ea0 100644
--- a/lib/lib_fputs.c
+++ b/lib/stdio/lib_fputs.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fputs.c
+ * lib/stdio/lib_fputs.c
  *
- *   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
diff --git a/lib/lib_fread.c b/lib/stdio/lib_fread.c
similarity index 97%
rename from lib/lib_fread.c
rename to lib/stdio/lib_fread.c
index 3345e55b15d..cc652fab721 100644
--- a/lib/lib_fread.c
+++ b/lib/stdio/lib_fread.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fread.c
+ * lib/stdio/lib_fread.c
  *
- *   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
diff --git a/lib/lib_fseek.c b/lib/stdio/lib_fseek.c
similarity index 98%
rename from lib/lib_fseek.c
rename to lib/stdio/lib_fseek.c
index 379e5c322f2..e56645ab6d3 100644
--- a/lib/lib_fseek.c
+++ b/lib/stdio/lib_fseek.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fseek.c
+ * lib/stdio/lib_fseek.c
  *
- *   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
diff --git a/lib/lib_fsetpos.c b/lib/stdio/lib_fsetpos.c
similarity index 98%
rename from lib/lib_fsetpos.c
rename to lib/stdio/lib_fsetpos.c
index eca0c2d673a..637c627b50d 100644
--- a/lib/lib_fsetpos.c
+++ b/lib/stdio/lib_fsetpos.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fsetpos.c
+ * lib/stdio/lib_fsetpos.c
  *
- *   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
diff --git a/lib/lib_ftell.c b/lib/stdio/lib_ftell.c
similarity index 98%
rename from lib/lib_ftell.c
rename to lib/stdio/lib_ftell.c
index 3b3bee77556..b0b0a78e585 100644
--- a/lib/lib_ftell.c
+++ b/lib/stdio/lib_ftell.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_ftell.c
+ * lib/stdio/lib_ftell.c
  *
- *   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
diff --git a/lib/lib_fwrite.c b/lib/stdio/lib_fwrite.c
similarity index 97%
rename from lib/lib_fwrite.c
rename to lib/stdio/lib_fwrite.c
index 2ec35cd605f..1b7be2ce5ce 100644
--- a/lib/lib_fwrite.c
+++ b/lib/stdio/lib_fwrite.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_fwrite.c
+ * lib/stdio/lib_fwrite.c
  *
- *   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
diff --git a/lib/lib_gets.c b/lib/stdio/lib_gets.c
similarity index 98%
rename from lib/lib_gets.c
rename to lib/stdio/lib_gets.c
index e8b7f717ee7..33ae48aaabe 100644
--- a/lib/lib_gets.c
+++ b/lib/stdio/lib_gets.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_gets.c
+ * lib/stdio/lib_gets.c
  *
- *   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
diff --git a/lib/lib_libfflush.c b/lib/stdio/lib_libfflush.c
similarity index 98%
rename from lib/lib_libfflush.c
rename to lib/stdio/lib_libfflush.c
index 3604d00b9d2..68a1bc39fca 100644
--- a/lib/lib_libfflush.c
+++ b/lib/stdio/lib_libfflush.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libfflush.c
+ * lib/stdio/lib_libfflush.c
  *
- *   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
diff --git a/lib/lib_libflushall.c b/lib/stdio/lib_libflushall.c
similarity index 98%
rename from lib/lib_libflushall.c
rename to lib/stdio/lib_libflushall.c
index 49ee41e6623..de2853df817 100644
--- a/lib/lib_libflushall.c
+++ b/lib/stdio/lib_libflushall.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libflushall.c
+ * lib/stdio/lib_libflushall.c
  *
- *   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
diff --git a/lib/lib_libfread.c b/lib/stdio/lib_libfread.c
similarity index 98%
rename from lib/lib_libfread.c
rename to lib/stdio/lib_libfread.c
index 52f80fee858..abeb34deb69 100644
--- a/lib/lib_libfread.c
+++ b/lib/stdio/lib_libfread.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libfread.c
+ * lib/stdio/lib_libfread.c
  *
- *   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
diff --git a/lib/lib_libfwrite.c b/lib/stdio/lib_libfwrite.c
similarity index 98%
rename from lib/lib_libfwrite.c
rename to lib/stdio/lib_libfwrite.c
index 616e8a6246e..3b7253cdd0f 100644
--- a/lib/lib_libfwrite.c
+++ b/lib/stdio/lib_libfwrite.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libfwrite.c
+ * lib/stdio/lib_libfwrite.c
  *
- *   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
diff --git a/lib/lib_libsprintf.c b/lib/stdio/lib_libsprintf.c
similarity index 97%
rename from lib/lib_libsprintf.c
rename to lib/stdio/lib_libsprintf.c
index 1f297fe45ef..04d5477541c 100644
--- a/lib/lib_libsprintf.c
+++ b/lib/stdio/lib_libsprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libsprintf.c
+ * lib/stdio/lib_libsprintf.c
  *
- *   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
diff --git a/lib/lib_libvsprintf.c b/lib/stdio/lib_libvsprintf.c
similarity index 99%
rename from lib/lib_libvsprintf.c
rename to lib/stdio/lib_libvsprintf.c
index 7ad2184eb7b..b3b9e41e630 100644
--- a/lib/lib_libvsprintf.c
+++ b/lib/stdio/lib_libvsprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_libvsprintf.c
+ * lib/stdio/lib_libvsprintf.c
  *
- *   Copyright (C) 2007-2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1108,7 +1108,7 @@ static void postjustify(FAR struct lib_outstream_s *obj, uint8_t fmt,
  ****************************************************************************/
 
 /****************************************************************************
- * lib_vsprintf
+ * lib/stdio/lib_vsprintf
  ****************************************************************************/
 
 int lib_vsprintf(FAR struct lib_outstream_s *obj, const char *src, va_list ap)
diff --git a/lib/lib_lowinstream.c b/lib/stdio/lib_lowinstream.c
similarity index 97%
rename from lib/lib_lowinstream.c
rename to lib/stdio/lib_lowinstream.c
index c5016bebe76..85f916acb93 100644
--- a/lib/lib_lowinstream.c
+++ b/lib/stdio/lib_lowinstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_lowinstream.c
+ * lib/stdio/lib_lowinstream.c
  *
- *   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
diff --git a/lib/lib_lowoutstream.c b/lib/stdio/lib_lowoutstream.c
similarity index 97%
rename from lib/lib_lowoutstream.c
rename to lib/stdio/lib_lowoutstream.c
index 0bbf6450fcd..2ab7c9f675b 100644
--- a/lib/lib_lowoutstream.c
+++ b/lib/stdio/lib_lowoutstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_lowoutstream.c
+ * lib/stdio/lib_lowoutstream.c
  *
- *   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
diff --git a/lib/lib_lowprintf.c b/lib/stdio/lib_lowprintf.c
similarity index 97%
rename from lib/lib_lowprintf.c
rename to lib/stdio/lib_lowprintf.c
index 1b071331ffc..576402d61b7 100644
--- a/lib/lib_lowprintf.c
+++ b/lib/stdio/lib_lowprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_lowprintf.c
+ * lib/stdio/lib_lowprintf.c
  *
- *   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
diff --git a/lib/lib_meminstream.c b/lib/stdio/lib_meminstream.c
similarity index 97%
rename from lib/lib_meminstream.c
rename to lib/stdio/lib_meminstream.c
index 62260c63928..6e1db7c2c7b 100644
--- a/lib/lib_meminstream.c
+++ b/lib/stdio/lib_meminstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_meminstream.c
+ * lib/stdio/lib_meminstream.c
  *
- *   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
diff --git a/lib/lib_memoutstream.c b/lib/stdio/lib_memoutstream.c
similarity index 97%
rename from lib/lib_memoutstream.c
rename to lib/stdio/lib_memoutstream.c
index 0395e22a96d..1cf2a8f29ad 100644
--- a/lib/lib_memoutstream.c
+++ b/lib/stdio/lib_memoutstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_memoutstream.c
+ * lib/stdio/lib_memoutstream.c
  *
- *   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
diff --git a/lib/lib_nullinstream.c b/lib/stdio/lib_nullinstream.c
similarity index 96%
rename from lib/lib_nullinstream.c
rename to lib/stdio/lib_nullinstream.c
index cd24bc1f6e4..271cba396fa 100644
--- a/lib/lib_nullinstream.c
+++ b/lib/stdio/lib_nullinstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_nullinstream.c
+ * lib/stdio/lib_nullinstream.c
  *
- *   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
diff --git a/lib/lib_nulloutstream.c b/lib/stdio/lib_nulloutstream.c
similarity index 96%
rename from lib/lib_nulloutstream.c
rename to lib/stdio/lib_nulloutstream.c
index c3dcfe0f6fa..85b7daa9e27 100644
--- a/lib/lib_nulloutstream.c
+++ b/lib/stdio/lib_nulloutstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_nulloutstream.c
+ * lib/stdio/lib_nulloutstream.c
  *
- *   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
diff --git a/lib/lib_printf.c b/lib/stdio/lib_printf.c
similarity index 97%
rename from lib/lib_printf.c
rename to lib/stdio/lib_printf.c
index f2e0c8f7bab..d24355f40fd 100644
--- a/lib/lib_printf.c
+++ b/lib/stdio/lib_printf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_printf.c
+ * lib/stdio/lib_printf.c
  *
- *   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
diff --git a/lib/lib_puts.c b/lib/stdio/lib_puts.c
similarity index 97%
rename from lib/lib_puts.c
rename to lib/stdio/lib_puts.c
index 129c7b807f1..5e651c4dea2 100644
--- a/lib/lib_puts.c
+++ b/lib/stdio/lib_puts.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_puts.c
+ * lib/stdio/lib_puts.c
  *
- *   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
diff --git a/lib/lib_rawinstream.c b/lib/stdio/lib_rawinstream.c
similarity index 97%
rename from lib/lib_rawinstream.c
rename to lib/stdio/lib_rawinstream.c
index de7301a5824..b54305ce64f 100644
--- a/lib/lib_rawinstream.c
+++ b/lib/stdio/lib_rawinstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_rawinstream.c
+ * lib/stdio/lib_rawinstream.c
  *
- *   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
diff --git a/lib/lib_rawoutstream.c b/lib/stdio/lib_rawoutstream.c
similarity index 97%
rename from lib/lib_rawoutstream.c
rename to lib/stdio/lib_rawoutstream.c
index 4d102446bd8..bf9a682068f 100644
--- a/lib/lib_rawoutstream.c
+++ b/lib/stdio/lib_rawoutstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_rawoutstream.c
+ * lib/stdio/lib_rawoutstream.c
  *
- *   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
diff --git a/lib/lib_rawprintf.c b/lib/stdio/lib_rawprintf.c
similarity index 97%
rename from lib/lib_rawprintf.c
rename to lib/stdio/lib_rawprintf.c
index 9999b8ecc68..915fd833bf8 100644
--- a/lib/lib_rawprintf.c
+++ b/lib/stdio/lib_rawprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_rawprintf.c
+ * lib/stdio/lib_rawprintf.c
  *
- *   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
diff --git a/lib/lib_rdflush.c b/lib/stdio/lib_rdflush.c
similarity index 98%
rename from lib/lib_rdflush.c
rename to lib/stdio/lib_rdflush.c
index 451dccfdc7e..592cc418392 100644
--- a/lib/lib_rdflush.c
+++ b/lib/stdio/lib_rdflush.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_rdflush.c
+ * lib/stdio/lib_rdflush.c
  *
- *   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
diff --git a/lib/lib_snprintf.c b/lib/stdio/lib_snprintf.c
similarity index 97%
rename from lib/lib_snprintf.c
rename to lib/stdio/lib_snprintf.c
index 4c3b01e307b..a4dcd399bdd 100644
--- a/lib/lib_snprintf.c
+++ b/lib/stdio/lib_snprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_snprintf.c
+ * lib/stdio/lib_snprintf.c
  *
- *   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
diff --git a/lib/lib_sprintf.c b/lib/stdio/lib_sprintf.c
similarity index 97%
rename from lib/lib_sprintf.c
rename to lib/stdio/lib_sprintf.c
index f5efe323541..6de019cc5f6 100644
--- a/lib/lib_sprintf.c
+++ b/lib/stdio/lib_sprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_sprintf.c
+ * lib/stdio/lib_sprintf.c
  *
- *   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
diff --git a/lib/lib_sscanf.c b/lib/stdio/lib_sscanf.c
similarity index 99%
rename from lib/lib_sscanf.c
rename to lib/stdio/lib_sscanf.c
index c6110bdb0b8..9f2a411a4ee 100644
--- a/lib/lib_sscanf.c
+++ b/lib/stdio/lib_sscanf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib_sscanf.c
+ * lib/stdio/lib_sscanf.c
  *
- *   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
diff --git a/lib/lib_stdinstream.c b/lib/stdio/lib_stdinstream.c
similarity index 97%
rename from lib/lib_stdinstream.c
rename to lib/stdio/lib_stdinstream.c
index 4f99e443941..d89b6b63a0e 100644
--- a/lib/lib_stdinstream.c
+++ b/lib/stdio/lib_stdinstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_stdinstream.c
+ * lib/stdio/lib_stdinstream.c
  *
- *   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
diff --git a/lib/lib_stdoutstream.c b/lib/stdio/lib_stdoutstream.c
similarity index 97%
rename from lib/lib_stdoutstream.c
rename to lib/stdio/lib_stdoutstream.c
index d92236edb77..272a93309a2 100644
--- a/lib/lib_stdoutstream.c
+++ b/lib/stdio/lib_stdoutstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_stdoutstream.c
+ * lib/stdio/lib_stdoutstream.c
  *
- *   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
diff --git a/lib/lib_ungetc.c b/lib/stdio/lib_ungetc.c
similarity index 97%
rename from lib/lib_ungetc.c
rename to lib/stdio/lib_ungetc.c
index b3ec910c0a7..9ad72b394e4 100644
--- a/lib/lib_ungetc.c
+++ b/lib/stdio/lib_ungetc.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_ungetc.c
+ * lib/stdio/lib_ungetc.c
  *
- *   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
diff --git a/lib/lib_vfprintf.c b/lib/stdio/lib_vfprintf.c
similarity index 97%
rename from lib/lib_vfprintf.c
rename to lib/stdio/lib_vfprintf.c
index 5e17526a19a..25c3954c082 100644
--- a/lib/lib_vfprintf.c
+++ b/lib/stdio/lib_vfprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_vfprintf.c
+ * lib/stdio/lib_vfprintf.c
  *
- *   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
diff --git a/lib/lib_vprintf.c b/lib/stdio/lib_vprintf.c
similarity index 97%
rename from lib/lib_vprintf.c
rename to lib/stdio/lib_vprintf.c
index 65498250d3f..a2e31fa0523 100644
--- a/lib/lib_vprintf.c
+++ b/lib/stdio/lib_vprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_vprintf.c
+ * lib/stdio/lib_vprintf.c
  *
- *   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
diff --git a/lib/lib_vsnprintf.c b/lib/stdio/lib_vsnprintf.c
similarity index 97%
rename from lib/lib_vsnprintf.c
rename to lib/stdio/lib_vsnprintf.c
index 6391701c8b1..da885977c7e 100644
--- a/lib/lib_vsnprintf.c
+++ b/lib/stdio/lib_vsnprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_vsnprintf.c
+ * lib/stdio/lib_vsnprintf.c
  *
- *   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
diff --git a/lib/lib_vsprintf.c b/lib/stdio/lib_vsprintf.c
similarity index 96%
rename from lib/lib_vsprintf.c
rename to lib/stdio/lib_vsprintf.c
index a22de0d6507..72a829a7942 100644
--- a/lib/lib_vsprintf.c
+++ b/lib/stdio/lib_vsprintf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_vsprintf.c
+ * lib/stdio/lib_vsprintf.c
  *
- *   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
@@ -84,7 +84,7 @@ int vsprintf(FAR char *dest, const char *src, va_list ap)
   struct lib_memoutstream_s memoutstream;
 
   /* Wrap the destination buffer in a stream object and let
-   * lib_vsprintf do the work.
+   * lib/stdio/lib_vsprintf do the work.
    */
 
   lib_memoutstream((FAR struct lib_memoutstream_s *)&memoutstream, dest, LIB_BUFLEN_UNKNOWN);
diff --git a/lib/lib_wrflush.c b/lib/stdio/lib_wrflush.c
similarity index 97%
rename from lib/lib_wrflush.c
rename to lib/stdio/lib_wrflush.c
index 0714c4d3ceb..c16109515b4 100644
--- a/lib/lib_wrflush.c
+++ b/lib/stdio/lib_wrflush.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_wrflush.c
+ * lib/stdio/lib_wrflush.c
  *
- *   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
diff --git a/lib/lib_zeroinstream.c b/lib/stdio/lib_zeroinstream.c
similarity index 96%
rename from lib/lib_zeroinstream.c
rename to lib/stdio/lib_zeroinstream.c
index 8cf55f51dc8..27655b54753 100644
--- a/lib/lib_zeroinstream.c
+++ b/lib/stdio/lib_zeroinstream.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * lib/lib_zeroinstream.c
+ * lib/stdio/lib_zeroinstream.c
  *
- *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 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
diff --git a/lib/string/Make.defs b/lib/string/Make.defs
index c8f5b05f34e..ad9340a829a 100644
--- a/lib/string/Make.defs
+++ b/lib/string/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # lib/string/Make.defs
 #
-#   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without