diff --git a/apps/shell/shell.c b/apps/shell/shell.c
index 2a3713bc5..5d3ef39b9 100644
--- a/apps/shell/shell.c
+++ b/apps/shell/shell.c
@@ -28,7 +28,7 @@
  *
  * This file is part of the Contiki operating system.
  *
- * $Id: shell.c,v 1.9 2008/02/28 23:29:07 adamdunkels Exp $
+ * $Id: shell.c,v 1.10 2008/07/03 21:15:12 adamdunkels Exp $
  */
 
 /**
@@ -215,22 +215,32 @@ start_command(char *commandline, struct shell_command *child)
   int command_len;
   struct shell_command *c;
 
+  /* Shave off any leading spaces. */
   while(*commandline == ' ') {
     commandline++;
   }
-  
+
+  /* Find the next command in a pipeline and start it. */
   next = find_pipe(commandline);
   if(next != NULL) {
     *next = 0;
     child = start_command(next + 1, child);
   }
 
+  /* Separate the command arguments, and remove braces. */
   replace_braces(commandline);
   args = strchr(commandline, ' ');
   if(args != NULL) {
     args++;
   }
 
+  /* Shave off any trailing spaces. */
+  command_len = (int)strlen(commandline);
+  while(command_len > 0 && commandline[command_len - 1] == ' ') {
+    commandline[command_len - 1] = 0;
+    command_len--;
+  }
+  
   if(args == NULL) {
     command_len = (int)strlen(commandline);
     args = &commandline[command_len];
@@ -509,6 +519,7 @@ shell_strtolong(const char *str, const char **retstr)
 unsigned long
 shell_time(void)
 {
+  /* XXX todo: fix process to avoid wrap-around */
   return clock_time() / CLOCK_SECOND + time_offset;
 }
 /*---------------------------------------------------------------------------*/