diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/model/LocalServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/model/LocalServiceCommandShell.java
index 9b8982dd472..4063415fd5c 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/model/LocalServiceCommandShell.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.local/src/org/eclipse/rse/internal/subsystems/shells/local/model/LocalServiceCommandShell.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
+ * Copyright (c) 2006, 2009 IBM Corporation 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
@@ -13,6 +13,7 @@
  *
  * Contributors:
  * Martin Oberhuber (Wind River) - [225510][api] Fix OutputRefreshJob API leakage
+ * David McKnight   (IBM)        - [272032][ssh][telnet][local] shell output not setting line numbers when available
  *******************************************************************************/
 
 package org.eclipse.rse.internal.subsystems.shells.local.model;
@@ -135,6 +136,9 @@ public class LocalServiceCommandShell extends ServiceCommandShell
 				{
 					output.setAbsolutePath(_workingDir + File.separatorChar + file);
 				}
+				if (parsedMsg.line > 0){
+					output.setLine(parsedMsg.line);
+				}
 			}
 
 			addOutput(output);
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/internal/subsystems/shells/ssh/SshServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/internal/subsystems/shells/ssh/SshServiceCommandShell.java
index 4c420b6e406..ae563737ef1 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/internal/subsystems/shells/ssh/SshServiceCommandShell.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/src/org/eclipse/rse/internal/subsystems/shells/ssh/SshServiceCommandShell.java
@@ -16,6 +16,7 @@
  * Martin Oberhuber (Wind River) - [225510][api] Fix OutputRefreshJob API leakage
  * Anna Dushistova  (MontaVista) - [259414][api] refactor the "SSH Shell" to use the generic Terminal->IHostShell converter
  * Anna Dushistova  (MontaVista) - [261478] Remove SshShellService, SshHostShell (or deprecate and schedule for removal in 3.2)
+ * David McKnight   (IBM)        - [272032][ssh][telnet][local] shell output not setting line numbers when available
  *******************************************************************************/
 
 package org.eclipse.rse.internal.subsystems.shells.ssh;
@@ -146,6 +147,7 @@ public class SshServiceCommandShell extends ServiceCommandShell
 			else  {
 				output = new RemoteOutput(this, type);
 			}
+			
 
 			output.setText(line);
 			if (parsedMsg != null)
@@ -165,6 +167,9 @@ public class SshServiceCommandShell extends ServiceCommandShell
 				{
 					output.setAbsolutePath(file);
 				}
+				if (parsedMsg.line > 0){
+					output.setLine(parsedMsg.line);
+				}
 			}
 
 			addOutput(output);
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/src/org/eclipse/rse/internal/subsystems/shells/telnet/TelnetServiceCommandShell.java b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/src/org/eclipse/rse/internal/subsystems/shells/telnet/TelnetServiceCommandShell.java
index 86d5f4b9ae6..30923aeb38d 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/src/org/eclipse/rse/internal/subsystems/shells/telnet/TelnetServiceCommandShell.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.telnet/src/org/eclipse/rse/internal/subsystems/shells/telnet/TelnetServiceCommandShell.java
@@ -17,6 +17,7 @@
  * Martin Oberhuber (Wind River) - [225510][api] Fix OutputRefreshJob API leakage
  * Anna Dushistova  (MontaVista) - [240523] [rseterminals] Provide a generic adapter factory that adapts any ITerminalService to an IShellService
  * Anna Dushistova  (MontaVista) - [261478] Remove SshShellService, SshHostShell (or deprecate and schedule for removal in 3.2)
+ * David McKnight   (IBM)        - [272032][ssh][telnet][local] shell output not setting line numbers when available
  *******************************************************************************/
 package org.eclipse.rse.internal.subsystems.shells.telnet;
 
@@ -158,6 +159,9 @@ public class TelnetServiceCommandShell extends ServiceCommandShell {
 				{
 					output.setAbsolutePath(file);
 				}
+				if (parsedMsg.line > 0){
+					output.setLine(parsedMsg.line);
+				}
 			}
 
 			addOutput(output);