diff --git a/build.xml b/build.xml
index 6cb58e873..9ffb30aaf 100644
--- a/build.xml
+++ b/build.xml
@@ -144,6 +144,7 @@
       <filename name="${optional.package}/sitraka/**"/>
       <filename name="${optional.package}/ide/VAJ*"/>
       <filename name="${optional.package}/starteam/*"/>
+      <filename name="${optional.package}/ssh/*"/>
       <!-- uses JDK 1.2 classloading facilities -->
       <filename name="${ant.package}/loader/AntClassLoader2.java"/>
     </or>
@@ -157,7 +158,6 @@
   <selector id="needs.jdk1.4+">
     <or>
       <filename name="${regexp.package}/Jdk14Regexp*"/>
-      <filename name="${optional.package}/ssh/*"/>
     </or>
   </selector>
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
index 1d48e20d0..3f9c3a75c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpFromMessage.java
@@ -58,7 +58,6 @@ import com.jcraft.jsch.*;
 
 import java.io.*;
 import java.util.StringTokenizer;
-import java.text.NumberFormat;
 
 public class ScpFromMessage extends AbstractSshMessage {
 
@@ -154,8 +153,7 @@ public class ScpFromMessage extends AbstractSshMessage {
         String command = token.nextToken();
         int filesize = Integer.parseInt( token.nextToken() );
         String filename = token.nextToken();
-        NumberFormat formatter = NumberFormat.getIntegerInstance();
-        log( "Receiving: " + filename + " : " + formatter.format( filesize ) );
+        log( "Receiving: " + filename + " : " + filesize);
         File transferFile = ( localFile.isDirectory() )
                 ? new File( localFile, filename )
                 : localFile;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
index 692c81b29..1a84943b7 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/ScpToMessage.java
@@ -60,7 +60,6 @@ import com.jcraft.jsch.JSchException;
 
 import java.io.*;
 import java.util.*;
-import java.text.NumberFormat;
 
 public class ScpToMessage extends AbstractSshMessage {
 
@@ -182,9 +181,8 @@ public class ScpToMessage extends AbstractSshMessage {
         long startTime = System.currentTimeMillis();
         int totalLength = 0;
         try {
-            NumberFormat formatter = NumberFormat.getIntegerInstance();
-            log( "Sending: " + localFile.getName() + " : " +
-                    formatter.format( localFile.length() ) );
+            log( "Sending: " + localFile.getName() + " : " + 
+                 localFile.length());
             while (true) {
                 int len = fis.read(buf, 0, buf.length);
                 if (len <= 0) break;