diff --git a/ChangeLog b/ChangeLog
index 12c99f651b..1ae0fd8ffb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -816,4 +816,7 @@
 	  with more standard exec() functions, however, because (1) it returns
 	  and (2) it requires symbol table arguments.
 	* lib/: Add fileno()
-
+	* examples/ostest: Several of the tests used a big, hard-coded stack size
+	  when creating test threads (16Kb stacksize).  The stack size should
+	  be controlled by the .config file or the OSTest won't work on platforms
+	  with memory constraints.
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index 0f4459c15e..a8a546ca0f 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: July 12, 2009</p>
+      <p>Last Updated: July 13, 2009</p>
     </td>
   </tr>
 </table>
@@ -1489,6 +1489,10 @@ nuttx-0.4.10 2009-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 	  with more standard exec() functions, however, because (1) it returns
 	  and (2) it requires symbol table arguments.
 	* lib/: Add fileno()
+	* examples/ostest: Several of the tests used a big, hard-coded stack size
+	  when creating test threads (16Kb stacksize).  The stack size should
+	  be controlled by the .config file or the OSTest won't work on platforms
+	  with memory constraints.
 
 nuttx-0.4.10 2009-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
diff --git a/examples/ostest/cancel.c b/examples/ostest/cancel.c
index 193b2fbda8..bf2d03615f 100644
--- a/examples/ostest/cancel.c
+++ b/examples/ostest/cancel.c
@@ -1,7 +1,7 @@
 /***********************************************************************
  * examples/ostest/cancel.c
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -131,7 +131,7 @@ static void start_thread(pthread_t *waiter, int cancelable)
       printf("start_thread: pthread_attr_init failed, status=%d\n", status);
     }
 
-  status = pthread_attr_setstacksize(&attr, 16384);
+  status = pthread_attr_setstacksize(&attr, STACKSIZE);
   if (status != 0)
     {
       printf("start_thread: pthread_attr_setstacksize failed, status=%d\n", status);
diff --git a/examples/ostest/mqueue.c b/examples/ostest/mqueue.c
index cbebfd804a..8c96d9cf4d 100644
--- a/examples/ostest/mqueue.c
+++ b/examples/ostest/mqueue.c
@@ -1,7 +1,7 @@
 /**************************************************************************
  * mqueue.c
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -296,7 +296,7 @@ void mqueue_test(void)
       printf("mqueue_test: pthread_attr_init failed, status=%d\n", status);
     }
 
-  status = pthread_attr_setstacksize(&attr, 16384);
+  status = pthread_attr_setstacksize(&attr, STACKSIZE);
   if (status != 0)
     {
       printf("mqueue_test: pthread_attr_setstacksize failed, status=%d\n", status);
@@ -332,7 +332,7 @@ void mqueue_test(void)
       printf("mqueue_test: pthread_attr_init failed, status=%d\n", status);
     }
 
-  status = pthread_attr_setstacksize(&attr, 16384);
+  status = pthread_attr_setstacksize(&attr, STACKSIZE);
   if (status != 0)
     {
       printf("mqueue_test: pthread_attr_setstacksize failed, status=%d\n", status);
diff --git a/examples/ostest/timedmqueue.c b/examples/ostest/timedmqueue.c
index a25c059712..9c14ec4149 100644
--- a/examples/ostest/timedmqueue.c
+++ b/examples/ostest/timedmqueue.c
@@ -1,7 +1,7 @@
 /**************************************************************************
  * examples/ostest/mqueue.c
  *
- *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -336,7 +336,7 @@ void timedmqueue_test(void)
       printf("timedmqueue_test: pthread_attr_init failed, status=%d\n", status);
     }
 
-  status = pthread_attr_setstacksize(&attr, 16384);
+  status = pthread_attr_setstacksize(&attr, STACKSIZE);
   if (status != 0)
     {
       printf("timedmqueue_test: pthread_attr_setstacksize failed, status=%d\n", status);
@@ -366,7 +366,7 @@ void timedmqueue_test(void)
       printf("timedmqueue_test: pthread_attr_init failed, status=%d\n", status);
     }
 
-  status = pthread_attr_setstacksize(&attr, 16384);
+  status = pthread_attr_setstacksize(&attr, STACKSIZE);
   if (status != 0)
     {
       printf("timedmqueue_test: pthread_attr_setstacksize failed, status=%d\n", status);