diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java
index 327cb1b9550..24e4bf962c2 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/IRemoteCmdSubSystem.java
@@ -19,6 +19,7 @@ package org.eclipse.rse.subsystems.shells.core.subsystems;
 import java.util.List;
 
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.subsystems.IRemoteSystemEnvVar;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.swt.widgets.Shell;
@@ -142,7 +143,9 @@ public interface IRemoteCmdSubSystem extends ISubSystem{
 	
 		
 	/**
-	 * Returns the shell encoding to assume when reading IO from a remote shell
+	 * Returns the shell encoding to assume when reading IO from a remote shell.
+	 * 
+	 * @deprecated use {@link IHost#getDefaultEncoding(boolean)} instead
 	 */
 	public String getShellEncoding();
 	
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java
index 98fd60cab33..014a33b557f 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.core/src/org/eclipse/rse/subsystems/shells/core/subsystems/RemoteCmdSubSystem.java
@@ -93,6 +93,9 @@ public abstract class RemoteCmdSubSystem extends SubSystem implements IRemoteCmd
 		return null;
 	}
 
+	/**
+	 * @deprecated use {@link IHost#setDefaultEncoding(String, boolean)} instead
+	 */
 	public void setShellEncoding(String encoding)
 	{
 		IPropertySet set = getPropertySet("Remote"); //$NON-NLS-1$