diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 367dfc80a7..0f4ba19858 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-17	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* telnetd/telnetd.c: Honor configuration setting for telnet daemon
+	stack size.
+
 2009-12-15	Glenn Humphrey <glenn.humphrey@OARcorp.com>
 
 	* rtems/include/rtems/rtems/dpmem.h, rtems/include/rtems/rtems/event.h,
diff --git a/cpukit/telnetd/telnetd.c b/cpukit/telnetd/telnetd.c
index a901ca9131..74b4b6d0fb 100644
--- a/cpukit/telnetd/telnetd.c
+++ b/cpukit/telnetd/telnetd.c
@@ -334,7 +334,7 @@ rtems_status_code rtems_telnetd_initialize( void)
   telnetd_task_id = telnetd_spawn_task(
     "TNTD",
     rtems_telnetd_config.priority,
-    RTEMS_MINIMUM_STACK_SIZE,
+    rtems_telnetd_config.stack_size,
     rtems_task_telnetd,
     0
   );