diff --git a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g1installing.html b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g1installing.html
index 41f455d888d..21def5b6e68 100644
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g1installing.html
+++ b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g1installing.html
@@ -35,14 +35,13 @@ Other &gt; Remote System Explorer</i>.</p>
 -->
 <p><b class="reltaskshd">Follow-up tasks</b><br/>
 <a href="g2firststeps.html" title="">First Steps with the Remote System Explorer</a><br/>
-<a href="gxtending.html" title="">Extending Remote System Explorer</a><br/>
+<a href="../tasks/tbeginlinux.html" title="">Setting up a dstore server</a><br/>
 <!--
-<a href="../tasks/tbeginlinux.html" title="">Connecting to a remote
-Linux or UNIX server</a><br/>
 <a href="../tasks/tbeginwindows.html" title="">Connecting to a remote
 Windows server</a><br/>
 -->
 <a href="gusing.html" title="">Using Remote System Explorer Connections</a><br/>
+<a href="gxtending.html" title="">Extending Remote System Explorer</a><br/>
 </p>
 </div>
 </body>
diff --git a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g2firststeps.html b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g2firststeps.html
index 3e0afc2e681..031a14bcb6b 100644
--- a/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g2firststeps.html
+++ b/rse/doc/org.eclipse.rse.doc.user/gettingstarted/g2firststeps.html
@@ -42,6 +42,7 @@ daemon method.</p>
 
 <div>
 <p><b class="reltaskshd">Follow-up tasks</b><br/>
+<a href="../tasks/tbeginlinux.html" title="">Setting up a dstore server</a><br/>
 <a href="gusing.html" title="">Using Remote System Explorer Connections</a><br/>
 <a href="gxtending.html" title="">Extending Remote System Explorer</a><br/>
 </p>
diff --git a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html
index d24a99578c9..15acdd0a770 100755
--- a/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html
+++ b/rse/doc/org.eclipse.rse.doc.user/tasks/tbeginlinux.html
@@ -14,7 +14,8 @@
 <h1 class="topictitle1">Connecting to a remote Linux or UNIX server</h1>
 <p>The following documentation explains how to install the Linux or UNIX server
 code, start the server daemon, and make a connection to a remote Linux
-or UNIX server.</p>
+or UNIX server. Look <a href="tbeginwindows.html">here</a> for setting up
+a server on <a href="tbeginwindows.html">Windows</a>.</p>
 <div>
 <div class="p">
 <p><b>Prerequisites</b></p>
@@ -116,9 +117,21 @@ append a call to the daemon to your startup script.  Add the following lines
 to the bottom of the /etc/rc.d/rc.local file:<pre>cd /opt/rseserver
 perl ./daemon.pl &amp;</pre>
 </div>
-<p><b>SSL Encryption</b></p>
+<p><b>SSL Encryption and Firewalls</b></p>
 <div class="p">By default the RSE Dstore connection is unencrypted. You
 can, however, configure it to use SSL encryption.
+<p>Because all dstore data transfer is done through a single TCP/IP 
+connection, the connection can also be tunneled through an ssh channel.
+In fact, the same ssh channel can also be used to start the server,
+like in the following example:
+<pre>
+ssh -l moberhuber build.eclipse.org -L27127:build.eclipse.org:27127 \
+  "sh -c 'cd ~/rseserver/latest; ls; perl ./server.pl 27127'"
+</pre>
+Here, the RSE Server is started on port 27127 through an ssh connection,
+and at the same time port 27127 is forwarded through ssh to the local 
+host. You can now connect RSE to localhost:27127, and the connection
+will transparently be forwarded to the remote system.
 </div>
 </div>
 </div><br></br>