diff --git a/contrib/tcsh_completion_build.sh b/contrib/tcsh_completion_build.sh
--- a/contrib/tcsh_completion_build.sh
+++ b/contrib/tcsh_completion_build.sh
@@ -38,14 +38,13 @@ tcsh_file=${1-tcsh_completion}
 hg_commands=`hg --debug help | \
         sed -e '1,/^list of commands:/d' \
             -e '/^global options:/,$d' \
-            -e '/^ [^ ]/!d; s/[,:]//g;' | 
+            -e '/^ [^ ]/!d; s/[,:]//g;' | \
         xargs -n5 | \
-        sed -e '$!s/$/ \\\\/g; 2,$s/^ \{0,\}/    /g'`
+        sed -e '$!s/$/ \\\\/g; 2,$s/^ */    /g'`
 
 hg_global_options=`hg -v help | \
         sed -e '1,/global/d;/^ *-/!d; s/ [^- ].*//' | \
-        xargs -n5 | \
-        sed -e '$!s/$/ \\\\/g; 2,$s/^ \{0,\}/    /g'`
+        sed -e 's/ *$//; $!s/$/ \\\\/g; 2,$s/^ */    /g'`
 
 hg_version=`hg version | sed -e '1q'`