diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
index edee9a8ec..4987d0501 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHBase.java
@@ -277,7 +277,9 @@ public abstract class SSHBase extends Task implements LogListener {
                 throw new BuildException("Failed to load the SSH configuration file " + sshConfig, e);
             }
             
-            host = config.getHostname();
+            if (config.getHostname() != null) {
+                host = config.getHostname();
+            }
             
             if (userInfo.getName() == null) {
                 userInfo.setName(config.getUser());