diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 0810421f46..3553376e0e 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-15	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* libmisc/shell/main_setenv.c: Address Coverity issue 134 which
+	recommends using strnXXX methods.
+
 2011-03-15	Sebastian Huber <sebastian.huber@embedded-brains.de>
 
 	* libmisc/cpuuse/cpuusagereport.c: Avoid assumptions on execution
diff --git a/cpukit/libmisc/shell/main_setenv.c b/cpukit/libmisc/shell/main_setenv.c
index 5b7c92920f..eb47dddaa8 100644
--- a/cpukit/libmisc/shell/main_setenv.c
+++ b/cpukit/libmisc/shell/main_setenv.c
@@ -16,6 +16,13 @@
 #include <rtems/shell.h>
 #include "internal.h"
 
+/*
+ *  Limit examining or copying more than 256 characters at a time.
+ *  Yes, this is very arbitrary.  If there are POSIX constants, then
+ *  they should be used.
+ */
+#define MAX 156
+
 int rtems_shell_main_setenv(int argc, char *argv[])
 {
   char* env = NULL;
@@ -32,7 +39,7 @@ int rtems_shell_main_setenv(int argc, char *argv[])
   env = argv[1];
 
   for (arg = 2; arg < argc; arg++)
-    len += strlen(argv[arg]);
+    len += strnlen(argv[arg], MAX);
 
   len += argc - 2 - 1;
 
@@ -44,8 +51,8 @@ int rtems_shell_main_setenv(int argc, char *argv[])
   }
 
   for (arg = 2, p = string; arg < argc; arg++) {
-    strcpy(p, argv[arg]);
-    p += strlen(argv[arg]);
+    strncpy(p, argv[arg], MAX);
+    p += strnlen(argv[arg], MAX);
     if (arg < (argc - 1)) {
       *p = ' ';
       p++;