diff --git a/console/plugin.jelly b/console/plugin.jelly
index d6733397..10164822 100644
--- a/console/plugin.jelly
+++ b/console/plugin.jelly
@@ -30,7 +30,8 @@
     <j:set var="followOn" value="true"/>
     <j:while test="${followOn}">
       <log:info/>
-      <i:ask question="${pom.artifactId} ${pom.currentVersion} >" answer="goal" default="${lastGoal}"/>
+      <util:tokenize var="completorGoals" delim=",">${maven.console.completor.goals}</util:tokenize>
+      <i:ask question="${pom.artifactId} ${pom.currentVersion} >" answer="goal" default="${lastGoal}" completor="${completorGoals}"/>
       <j:choose>
         <j:when test="${goal.indexOf('=') == '0'}">
           <j:set var="prop" value="${goal.substring(1)}" />
diff --git a/console/plugin.properties b/console/plugin.properties
index 19e75505..1e919ecf 100644
--- a/console/plugin.properties
+++ b/console/plugin.properties
@@ -22,3 +22,4 @@
 # console (defaults to "help"). The usage section is displayed in
 # any case).
 maven.console.first = ${maven.default.goal}
+maven.console.completor.goals = clean,java:compile,jar,test,xdoc,site,quit,help
diff --git a/console/project.xml b/console/project.xml
index 2c05fc3a..bbba3915 100644
--- a/console/project.xml
+++ b/console/project.xml
@@ -53,12 +53,17 @@
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-interaction</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-log</artifactId>
       <version>1.0</version>
     </dependency>
+    <dependency>
+      <groupId>jline</groupId>
+      <artifactId>jline</artifactId>
+      <version>0.9.5</version>
+    </dependency> 
   </dependencies>
 </project>
diff --git a/console/xdocs/changes.xml b/console/xdocs/changes.xml
index 87f47a80..f300a314 100644
--- a/console/xdocs/changes.xml
+++ b/console/xdocs/changes.xml
@@ -25,6 +25,9 @@
   </properties>
   <body>
     <release version="1.2-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="update">Upgrade to commons-jelly-tags-interaction-1.1.</action>
+      <action dev="ltheussl" type="add" issue="MPCONSOLE-6">New property <code>maven.console.completor.goals</code>.</action>
+      <action dev="ltheussl" type="add">Add tab completion and history functionality using the jline library.</action>
       <action dev="brett" type="update" issue="MPCONSOLE-10">Split property setting into a separate goal console:set-properties to allow annotation of the properties</action>
       <action dev="brett" type="remove">Removed the <code>list</code> command as it hasn't worked as expected since the early betas (goals are lazy loaded into the werkz project)</action>
       <action dev="brett" type="add">Add way to display a property value</action>
diff --git a/console/xdocs/index.xml b/console/xdocs/index.xml
index 281ac12a..dfe3700c 100644
--- a/console/xdocs/index.xml
+++ b/console/xdocs/index.xml
@@ -61,14 +61,10 @@
 
     <section name="Improving the prompt">
       <p>
-        It is possible to add completion and history to the console, however
-        it requires the use of an external library. This library is licensed
-        under the LPGL, and so cannot be used in the console by default, but
-        can be downloaded from <a href="http://jline.sf.net">JLine</a>.
-      </p>
-      <p>
-        Instructions are detailed in this
-        <a href="http://marc.theaimsgroup.com/?l=turbine-maven-user&amp;m=110568914709557&amp;w=2">mailing list post</a>.
+        In version 1.2 of the console plugin, tab completion and history functionality
+        have been introduced via the use of the
+        <a href="http://jline.sourceforge.net/">jline</a> library. Check the jline
+        homepage for documentation, in particular a list of default key bindings.
       </p>
     </section>
  </body>
diff --git a/console/xdocs/navigation.xml b/console/xdocs/navigation.xml
index 64c323e2..64c23992 100644
--- a/console/xdocs/navigation.xml
+++ b/console/xdocs/navigation.xml
@@ -27,6 +27,7 @@
       <item name="Bundled" href="http://maven.apache.org/maven-1.x/plugins/bundled/"/>
     </breadcrumbs>
     <links>
+      <item name="jline" href="http://jline.sourceforge.net/"/>
     </links>
     <menu name="Overview">
       <item name="Goals" href="/goals.html"/>
diff --git a/console/xdocs/properties.xml b/console/xdocs/properties.xml
index 685aac26..0804db70 100644
--- a/console/xdocs/properties.xml
+++ b/console/xdocs/properties.xml
@@ -38,6 +38,15 @@
             The help is displayed in any case.
           </td>
         </tr>
+        <tr>
+          <td>maven.console.completor.goals</td>
+          <td>Yes</td>
+          <td>
+            A comma-separated list of goals that are known to the console plugin
+            for tab completion. Defaults to
+            "<code>clean,java:compile,jar,test,xdoc,site,quit,help</code>".
+          </td>
+        </tr>
       </table>
     </section>
   </body>
