diff --git a/releng/org.eclipse.rse.build/maps/terminal.map b/releng/org.eclipse.rse.build/maps/terminal.map
index 15ea599d72f..a40d3640fde 100644
--- a/releng/org.eclipse.rse.build/maps/terminal.map
+++ b/releng/org.eclipse.rse.build/maps/terminal.map
@@ -1,16 +1,16 @@
 feature@org.eclipse.tm.terminal=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal-feature
 feature@org.eclipse.tm.terminal.local=v201006030730,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local-feature
 feature@org.eclipse.tm.terminal.local.sdk=v201006030730,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local.sdk-feature
-feature@org.eclipse.tm.terminal.sdk=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
+feature@org.eclipse.tm.terminal.sdk=v201006030830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.sdk-feature
 feature@org.eclipse.tm.terminal.serial=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial-feature
 feature@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh-feature
 feature@org.eclipse.tm.terminal.telnet=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet-feature
 feature@org.eclipse.tm.terminal.test=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test-feature
-feature@org.eclipse.tm.terminal.view=v201005032000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature
-plugin@org.eclipse.tm.terminal=v201005261000,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal
+feature@org.eclipse.tm.terminal.view=v201006030830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view-feature
+plugin@org.eclipse.tm.terminal=v201006030830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal
 plugin@org.eclipse.tm.terminal.local=v201006030730,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.local
 plugin@org.eclipse.tm.terminal.serial=v200905272300,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.serial
 plugin@org.eclipse.tm.terminal.ssh=v201005271030,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.ssh
 plugin@org.eclipse.tm.terminal.telnet=v200909160005,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.telnet
 plugin@org.eclipse.tm.terminal.test=v201005220050,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.test
-plugin@org.eclipse.tm.terminal.view=v200907301400,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view
\ No newline at end of file
+plugin@org.eclipse.tm.terminal.view=v201006030830,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/terminal/org.eclipse.tm.terminal.view
\ No newline at end of file
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index 42f800ec831..f37c35d2b19 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -672,7 +672,7 @@
    <feature url="features/org.eclipse.tm.discovery_3.0.200.qualifier.jar" id="org.eclipse.tm.discovery" version="3.0.200.qualifier">
       <category name="TM and RSE 3.2"/>
    </feature>
-   <feature url="features/org.eclipse.tm.terminal.sdk_3.0.100.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.0.100.qualifier">
+   <feature url="features/org.eclipse.tm.terminal.sdk_3.1.0.qualifier.jar" id="org.eclipse.tm.terminal.sdk" version="3.1.0.qualifier">
       <category name="TM and RSE 3.2"/>
    </feature>
    <feature url="features/org.eclipse.tm.terminal.local_0.1.0.qualifier.jar" id="org.eclipse.tm.terminal.local" version="0.1.0.qualifier" os="aix,hpux,linux,macosx,solaris">
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
index 7b92b3d993b..b908b6a481b 100644
--- a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.sdk"
       label="%featureName"
-      version="3.0.100.qualifier"
+      version="3.1.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg">
 
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/feature.xml b/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
index 71332b59912..7163ef041c8 100644
--- a/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.tm.terminal.view"
       label="%featureName"
-      version="2.0.200.qualifier"
+      version="2.1.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF b/terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
index 85ac5a348b3..df43d265b59 100644
--- a/terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
+++ b/terminal/org.eclipse.tm.terminal.view/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.tm.terminal.view;singleton:=true
-Bundle-Version: 2.0.101.qualifier
+Bundle-Version: 2.1.0.qualifier
 Bundle-Activator: org.eclipse.tm.internal.terminal.view.TerminalViewPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.tm.terminal;bundle-version="[3.0.1,3.1.0)"
+ org.eclipse.tm.terminal;bundle-version="[3.0.100,3.1.0)"
 Bundle-ActivationPolicy: lazy
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/terminal/org.eclipse.tm.terminal.view/about.properties b/terminal/org.eclipse.tm.terminal.view/about.properties
index 9e7f3eb66fa..3f0773fd9b1 100644
--- a/terminal/org.eclipse.tm.terminal.view/about.properties
+++ b/terminal/org.eclipse.tm.terminal.view/about.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2009 Wind River Systems, Inc. and others.
+# Copyright (c) 2006, 2010 Wind River Systems, Inc. and others.
 # All rights reserved. This program and the accompanying materials 
 # are made available under the terms of the Eclipse Public License v1.0 
 # which accompanies this distribution, and is available at 
@@ -21,5 +21,5 @@ blurb=Target Management Terminal View\n\
 Version: {featureVersion}\n\
 Build id: {0}\n\
 \n\
-(c) Copyright Wind River Systems, Inc. and others 2003, 2009.  All rights reserved.\n\
+(c) Copyright Wind River Systems, Inc. and others 2003, 2010.  All rights reserved.\n\
 Visit http://www.eclipse.org/dsdp/tm
diff --git a/terminal/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html b/terminal/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html
index 62847cefc08..9deaa07724c 100644
--- a/terminal/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html
+++ b/terminal/org.eclipse.tm.terminal.view/doc/html/02_terminal_page.html
@@ -4,12 +4,12 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
 <meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="copyright" content="Copyright (c) 2004, 2008 Wind River Systems, Inc. and others. This page is made available under license. For full details see the LEGAL notice in the documentation book that contains this page." />
+<meta name="copyright" content="Copyright (c) 2004, 2010 Wind River Systems, Inc. and others. This page is made available under license. For full details see the LEGAL notice in the documentation book that contains this page." />
 <link rel="stylesheet" type="text/css" href="../book.css" />
 <title>Terminal View Quick Reference</title>
 </head>
 <!--
-Copyright (c) 2004, 2008 Wind River Systems, Inc. and others.
+Copyright (c) 2004, 2010 Wind River Systems, Inc. and others.
 All rights reserved. This program and the accompanying materials 
 are made available under the terms of the Eclipse Public License v1.0 
 which accompanies this distribution, and is available at 
@@ -27,17 +27,13 @@ Martin Oberhuber (Wind River) - initial API and implementation
     <td><p><b>Button</b></p></td>
     <td><p><b>Description</b></p></td>
   </tr>
-  <tr align="left" valign="top">
-    <td><p><img src="../../icons/clcl16/newterminal.gif" border="0" hspace="0" vspace="0"/></p></td>
-    <td><p>Open another Terminal connection in the current view, or in a new <b>Terminal</b> view instance.</p></td>
-  </tr>
   <tr align="left" valign="top">
     <td><p><img src="../../icons/clcl16/connect_co.gif" border="0" hspace="0" vspace="0"/></p></td>
-    <td><p>Connect to selected port.</p></td>
+    <td><p>Connect to selected target.</p></td>
   </tr>
   <tr align="left" valign="top">
     <td><p><img src="../../icons/clcl16/disconnect_co.gif" border="0" hspace="0" vspace="0"/></p></td>
-    <td><p>Disconnect from selected port.</p></td>
+    <td><p>Disconnect from selected connection.</p></td>
   </tr>
   <tr align="left" valign="top">
     <td><p><img src="../../icons/clcl16/properties_tsk.gif" border="0" hspace="0" vspace="0"/></p></td>
@@ -49,11 +45,19 @@ Martin Oberhuber (Wind River) - initial API and implementation
     <td><p>Toggle the <a href="04_terminal_emulation.html"><b>Command Input</b></a> field,
     for editing complex command lines on dumb terminals.</p></td>
   </tr>
+  <tr align="left" valign="top">
+    <td><p><img src="../../icons/clcl16/lock_co.gif" border="0" hspace="0" vspace="0"/></p></td>
+    <td><p>Toggle <b>Scroll Lock</b></a> in the current terminal connection.</p></td>
+  </tr>
   <tr align="left" valign="top">
     <td><p><img src="../../icons/cview16/terminal_view.gif" border="0" hspace="0" vspace="0"/></p></td>
     <td><p>Select a Terminal connection to show in this view instance.
     Only available when multiple connections have been defined in this view.</p></td>
   </tr>
+  <tr align="left" valign="top">
+    <td><p><img src="../../icons/clcl16/newterminal.gif" border="0" hspace="0" vspace="0"/></p></td>
+    <td><p>Open another Terminal connection in the current view, or in a new <b>Terminal</b> view instance.</p></td>
+  </tr>
   <tr align="left" valign="top">
     <td><p><img src="../../icons/dlcl16/rem_co.gif" border="0" hspace="0" vspace="0"/></p></td>
     <td><p>Remove the currently selected Terminal Connection from this view.
diff --git a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
index 0ab125ae1f4..041f882610d 100644
--- a/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
+++ b/terminal/org.eclipse.tm.terminal.view/src/org/eclipse/tm/internal/terminal/view/TerminalView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2009 Wind River Systems, Inc. and others.
+ * Copyright (c) 2003, 2010 Wind River Systems, Inc. and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
  * Michael Scharf (Wind River) - [196454] Initial connection settings dialog should not be blank
  * Michael Scharf (Wind River) - [241096] Secondary terminals in same view do not observe the "invert colors" Preference 
  * Michael Scharf (Wind River) - [262996] get rid of TerminalState.OPENED
+ * Martin Oberhuber (Wind River) - [205486] Enable ScrollLock
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.view;
 
@@ -54,6 +55,7 @@ import org.eclipse.tm.internal.terminal.actions.TerminalActionConnect;
 import org.eclipse.tm.internal.terminal.actions.TerminalActionDisconnect;
 import org.eclipse.tm.internal.terminal.actions.TerminalActionNewTerminal;
 import org.eclipse.tm.internal.terminal.actions.TerminalActionRemove;
+import org.eclipse.tm.internal.terminal.actions.TerminalActionScrollLock;
 import org.eclipse.tm.internal.terminal.actions.TerminalActionSelectionDropDown;
 import org.eclipse.tm.internal.terminal.actions.TerminalActionSettings;
 import org.eclipse.tm.internal.terminal.actions.TerminalActionToggleCommandInputField;
@@ -104,7 +106,7 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
 
 	protected TerminalAction fActionTerminalConnect;
 
-//	private TerminalAction fActionTerminalScrollLock;
+	private TerminalAction fActionTerminalScrollLock;
 
 	protected TerminalAction fActionTerminalDisconnect;
 
@@ -297,6 +299,7 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
 		updateTerminalDisconnect();
 		updateTerminalSettings();
 		fActionToggleCommandInputField.setChecked(hasCommandInputField());
+		fActionTerminalScrollLock.setChecked(isScrollLock());
 		updateSummary();
 	}
 
@@ -558,7 +561,7 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
 		fActionTerminalDropDown = new TerminalActionSelectionDropDown(fMultiConnectionManager);
 		fActionTerminalRemove=new TerminalActionRemove(fMultiConnectionManager);
 		fActionTerminalNewTerminal = new TerminalActionNewTerminal(this);
-//		fActionTerminalScrollLock = new TerminalActionScrollLock(this);
+		fActionTerminalScrollLock = new TerminalActionScrollLock(this);
 		fActionTerminalConnect = new TerminalActionConnect(this);
 		fActionTerminalDisconnect = new TerminalActionDisconnect(this);
 		fActionTerminalSettings = new TerminalActionSettings(this);
@@ -572,11 +575,11 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
 	protected void setupLocalToolBars() {
 		IToolBarManager toolBarMgr = getViewSite().getActionBars().getToolBarManager();
 
-//		toolBarMgr.add(fActionTerminalScrollLock);
 		toolBarMgr.add(fActionTerminalConnect);
 		toolBarMgr.add(fActionTerminalDisconnect);
 		toolBarMgr.add(fActionTerminalSettings);
 		toolBarMgr.add(fActionToggleCommandInputField);
+		toolBarMgr.add(fActionTerminalScrollLock);
 		toolBarMgr.add(new Separator("fixedGroup")); //$NON-NLS-1$
 		toolBarMgr.add(fActionTerminalDropDown);
 		toolBarMgr.add(fActionTerminalNewTerminal);
@@ -606,7 +609,7 @@ public class TerminalView extends ViewPart implements ITerminalView, ITerminalVi
 		menuMgr.add(fActionEditSelectAll);
 		menuMgr.add(new Separator());
 		menuMgr.add(fActionToggleCommandInputField);
-//		menuMgr.add(fActionTerminalScrollLock);
+		menuMgr.add(fActionTerminalScrollLock);
 
 
 		// Other plug-ins can contribute there actions here
diff --git a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
index 7c314a57036..1f671ee59a6 100644
--- a/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
+++ b/terminal/org.eclipse.tm.terminal/src/org/eclipse/tm/internal/terminal/textcanvas/TextCanvas.java
@@ -11,6 +11,7 @@
  * Uwe Stieber (Wind River) - [281328] The very first few characters might be missing in the terminal control if opened and connected programmatically
  * Martin Oberhuber (Wind River) - [294327] After logging in, the remote prompt is hidden
  * Anton Leherbauer (Wind River) - [294468] Fix scroller and text line rendering
+ * Uwe Stieber (Wind River) - [205486] Fix ScrollLock always moving to line 1
  *******************************************************************************/
 package org.eclipse.tm.internal.terminal.textcanvas;
 
@@ -93,8 +94,10 @@ public class TextCanvas extends GridCanvas {
 					return;
 				scrollToEnd();
 				// make sure the scroll area is correct:
-				scrollY(getVerticalBar());
-				scrollX(getHorizontalBar());
+				if (!fScrollLock) {
+					scrollY(getVerticalBar());
+					scrollX(getHorizontalBar());
+				}
 			}
 		});
 		// let the cursor blink if the text canvas gets the focus...
@@ -250,8 +253,10 @@ public class TextCanvas extends GridCanvas {
 			// scroll to end
 			scrollToEnd();
 			// make sure the scroll area is correct:
-			scrollY(getVerticalBar());
-			scrollX(getHorizontalBar());
+			if (!fScrollLock) {
+				scrollY(getVerticalBar());
+				scrollX(getHorizontalBar());
+			}
 	
 			getParent().layout();
 		} finally {