diff --git a/shell/plugin.jelly b/shell/plugin.jelly
index b9789642..32b08403 100644
--- a/shell/plugin.jelly
+++ b/shell/plugin.jelly
@@ -3,7 +3,7 @@
 <project xmlns:j="jelly:core"
   xmlns:test="test">
 
-  <goal name="shell"
+  <goal name="shell" prereqs="shell:zsh"
     description="Generate Zsh files"
     />
 
@@ -61,18 +61,18 @@ case "$state" in
 
 
       <j:choose>
-        <j:when test="${maven.shell.zdh.nodesc == 'true'}">
+        <j:when test="${context.getVariable('maven.shell.zsh.nodesc') == 'false'}">
            <j:set var="desc" value="${mavenSession.getGoalDescription(goal)}"/>
            <j:set var="escdesc" value='${desc.replaceAll(":","\\:")}'/>
            <j:set var="point" value="'"/>
            <j:set var="pointesc" value='"'/>
            <j:set var="escdesc" value='${escdesc.replaceAll(point,pointesc)}'/>
-        '${escgoal}:${escdesc}'          
+        '${escgoal}:${escdesc}'
         </j:when>
         <j:otherwise>
-        '${escgoal}'          
+        '${escgoal}'
         </j:otherwise>
-      </j:choose></j:forEach>
+      </j:choose><j:whitespace> </j:whitespace></j:forEach>
 
 
   <![CDATA[
diff --git a/shell/plugin.properties b/shell/plugin.properties
index a6d36248..12bf3a67 100644
--- a/shell/plugin.properties
+++ b/shell/plugin.properties
@@ -4,8 +4,7 @@
 # Shell plugin.
 # -------------------------------------------------------------------
 
-# Generate Eclipse external tools mappings for the specified goals.
-# This accepts two values: 'all' for all the goals, 
-# and 'plugins' to generate only the plugins' default goals.
+# Generate zsh completion function for maven.
+
 # maven.shell.zsh.dir= /usr/zsh/functions
-maven.shell.zsh.nodesc = true
\ No newline at end of file
+maven.shell.zsh.nodesc = true
diff --git a/shell/project.xml b/shell/project.xml
index b3089358..6aaf5b11 100644
--- a/shell/project.xml
+++ b/shell/project.xml
@@ -5,7 +5,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-shell-plugin</id>
   <name>Maven Shell Plug-in</name>
-  <currentVersion>1.0</currentVersion>
+  <currentVersion>1.1-SNAPSHOT</currentVersion>
   <description>A plugin to generate various files for different shells to allow tab completion for maven goals</description>
   <shortDescription>Shell Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/shell/</url>
diff --git a/shell/xdocs/changes.xml b/shell/xdocs/changes.xml
index c1eb96f1..8373d63d 100644
--- a/shell/xdocs/changes.xml
+++ b/shell/xdocs/changes.xml
@@ -6,6 +6,10 @@
   </properties>
 
   <body>
+    <release version="1.1" date="in CVS">
+      <action dev="dion" type="fix">Apply MAVEN-850</action>
+    </release>
+    
     <release version="1.0" date="2003-03-10">
       <action dev="knielsen" type="add">
         Initial release
diff --git a/shell/xdocs/goals.xml b/shell/xdocs/goals.xml
index 89f45856..5b96463f 100644
--- a/shell/xdocs/goals.xml
+++ b/shell/xdocs/goals.xml
@@ -9,7 +9,7 @@
   <body>
     <goals>
       <goal>
-        <name>sheel</name>
+        <name>shell</name>
         <description>
             The default goal. This goal simply executes the 
             <a href="#shell:zsh">shell:zsh</a> goal for now