diff --git a/shell.tui/NOTICE b/shell.tui/NOTICE
index 5955b0a..673c984 100644
--- a/shell.tui/NOTICE
+++ b/shell.tui/NOTICE
@@ -1,5 +1,5 @@
 Apache Felix Shell Textual Interface
-Copyright 2006-2008 The Apache Software Foundation
+Copyright 2006-2009 The Apache Software Foundation
 
 I. Included Software
 
diff --git a/shell.tui/doc/apache-felix-shell-tui.html b/shell.tui/doc/apache-felix-shell-tui.html
index 254760e..5f393db 100644
--- a/shell.tui/doc/apache-felix-shell-tui.html
+++ b/shell.tui/doc/apache-felix-shell-tui.html
@@ -25,14 +25,16 @@
 </p></li></ul> </div>
     <div class="main">
 <h1><a name="ApacheFelixShellTUI-ApacheFelixShellTUI"></a>Apache Felix Shell TUI</h1>
+<p>The Apache Felix Shell TUI (Textual User Interface) sub-project provides a simple, text-based user interface for the <a href="/confluence/display/FELIX/Apache+Felix+Shell+Service" title="Apache Felix Shell Service">Apache Felix Shell Service</a>. This bundle is not of much use by itself and should always be used in conjunction with the shell service bundle. The shell service and shell TUI bundles are used by the standard Felix launcher to provide a means for interacting with the launched Felix framework instance. The shell TUI bundle is not required to use the shell service; it is possible to use it programmatically, via a GUI interface, or a remote access interface.</p>
 
-<p>The Apache Felix Shell TUI (Textual User Interface) sub-project provides a simple, text-based user interface for the <a href="http://felix.apache.org/site/apache-felix-shell-service.html" title="Apache Felix Shell Service">Apache Felix Shell Service</a>.
-This bundle is not of much use by itself and should always be used in
-conjunction with the shell service bundle. The shell service and shell
-TUI bundles are used by the standard Felix launcher to provide a means
-for interacting with the launched Felix framework instance. The shell
-TUI bundle is not required to use the shell service; it is possible to
-use a GUI interface or remote access interface for interacting with the
-shell service.</p>
+<p>Shell TUI supports one configuration property:</p>
+
+<ul>
+	<li><tt>shell.tui.checkinput</tt> &#45; This is a simple workaround for a JRE bug which can appear when running Shell TUI inside Eclipse; the default value is <tt>false</tt>. Note that if this workaround is enabled, when running from the command line under Windows, character input is not echoed back to the screen.</li>
+</ul>
+
+
+<p>To set this property, add it to the <tt>conf/config.properties</tt> file of your Felix installation.</p>
+
     </div>
   </body></html>
diff --git a/shell.tui/doc/changelog.txt b/shell.tui/doc/changelog.txt
index e327dd4..dc1a7ee 100644
--- a/shell.tui/doc/changelog.txt
+++ b/shell.tui/doc/changelog.txt
@@ -1,3 +1,13 @@
+Changes from 1.2.0 to 1.4.0
+---------------------------
+
+** Bug
+    * [FELIX-619] - Shell.TUI causes "new java.io.ServerSocket()" to hang
+    * [FELIX-1137] - [PATCH] Shell TUI pom has incorrect Bundle-DocURL tag
+
+** Improvments
+    * Update to shell 1.4.0
+
 Changes from 1.0.2 to 1.2.0
 ---------------------------
 
diff --git a/shell.tui/pom.xml b/shell.tui/pom.xml
index 55cc1d9..3fa45d3 100644
--- a/shell.tui/pom.xml
+++ b/shell.tui/pom.xml
@@ -19,8 +19,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.0.4</version>
+    <artifactId>felix-parent</artifactId>
+    <version>1.2.0</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -33,12 +33,12 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.2.0</version>
+      <version>1.4.0</version>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.shell</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.4.0</version>
     </dependency>
   </dependencies>
   <build>