diff --git a/WHATSNEW b/WHATSNEW
index dfc4f33da..48c39d73d 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -31,6 +31,10 @@ Changes that could break older environments:
   compile against the current code base.  If it still compiles, it will
   probably not work as in Ant 1.5.1.
 
+* The <ftp> and <telnet> tasks now require Jakarta Commons Net instead
+  of the older ORO Netcomponents version.  See
+  <http://jakarta.apache.org/commons/net/index.html>.
+
 Fixed bugs:
 -----------
 * <translate> was not ignoring comment lines.
diff --git a/build.xml b/build.xml
index 8ce34077b..51257addb 100644
--- a/build.xml
+++ b/build.xml
@@ -253,7 +253,7 @@
       <filename name="${optional.package}/ejb/WLStop*"/>
     </or>
   </selector>
-  <selector id="needs.netcomponents">
+  <selector id="needs.commons.net">
     <or>
       <filename name="${optional.package}/net/FTP*"/>
       <filename name="${optional.package}/net/TelnetTask*"/>
@@ -381,8 +381,8 @@
     <available property="junit.present"
                classname="junit.framework.TestCase"
                classpathref="classpath"/>
-    <available property="netcomp.present"
-               classname="com.oroinc.net.ftp.FTPClient"
+    <available property="commons.net.present"
+               classname="org.apache.commons.net.ftp.FTPClient"
                classpathref="classpath"/>
     <available property="starteam.present"
                classname="com.starbase.util.Platform"
@@ -616,7 +616,7 @@
             <selector refid="needs.weblogic.ddcreator"
                       unless="ejb.DDCreator.present"/>
             <selector refid="needs.weblogic.server" unless="ejb.wls.present"/>
-            <selector refid="needs.netcomponents" unless="netcomp.present"/>
+            <selector refid="needs.commons.net" unless="commons.net.present"/>
             <selector refid="needs.starteam" unless="starteam.present"/>
             <selector refid="needs.vaj" unless="vaj.present"/>
             <selector refid="needs.antlr" unless="antlr.present"/>
@@ -783,7 +783,7 @@
             <selector refid="needs.weblogic.ejbc"/>
             <selector refid="needs.weblogic.ddcreator"/>
             <selector refid="needs.weblogic.server"/>
-            <selector refid="needs.netcomponents"/>
+            <selector refid="needs.commons.net"/>
             <selector refid="needs.starteam"/>
             <selector refid="needs.vaj"/>
             <selector refid="needs.antlr"/>
@@ -892,10 +892,10 @@
       <selector refid="needs.netrexx"/>
     </jar>
 
-    <jar destfile="${build.lib}/${optional.jars.prefix}-netcomp.jar"
+    <jar destfile="${build.lib}/${optional.jars.prefix}-commons-net.jar"
          basedir="${build.classes}"
          manifest="${manifest.tmp}">
-      <selector refid="needs.netcomponents"/>
+      <selector refid="needs.commons.net"/>
     </jar>
 
     <jar destfile="${build.lib}/${optional.jars.prefix}-starteam.jar"
diff --git a/docs/manual/install.html b/docs/manual/install.html
index 5582fdbeb..c5d4e3294 100644
--- a/docs/manual/install.html
+++ b/docs/manual/install.html
@@ -377,10 +377,10 @@ Installing Ant / Optional Tasks</a> section above.</p>
     <td><a href="http://www.judoscript.com/index.html" target="_top">www.judoscript.com/index.html</a></td>
   </tr>
   <tr>
-    <td>netcomponents.jar</td>
+    <td>commons-net.jar</td>
     <td>ftp and telnet tasks</td>
-    <td><a href="http://www.savarese.org/oro/downloads/index.html#NetComponents"
-           target="_top">www.savarese.org/oro/downloads</a></td>
+    <td><a href="http://jakarta.apache.org/commons/net/index.html"
+           target="_top">http://jakarta.apache.org/commons/net/index.html</a></td>
   </tr>
   <tr>
     <td>bcel.jar</td>
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index e7f57c623..3ba6aa584 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -53,9 +53,9 @@
  */
 package org.apache.tools.ant.taskdefs.optional.net;
 
-import com.oroinc.net.ftp.FTPClient;
-import com.oroinc.net.ftp.FTPFile;
-import com.oroinc.net.ftp.FTPReply;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.BufferedWriter;
@@ -1052,7 +1052,7 @@ public class FTP
             log("login succeeded", Project.MSG_VERBOSE);
 
             if (binary) {
-                ftp.setFileType(com.oroinc.net.ftp.FTP.IMAGE_FILE_TYPE);
+                ftp.setFileType(org.apache.commons.net.ftp.FTP.IMAGE_FILE_TYPE);
                 if (!FTPReply.isPositiveCompletion(ftp.getReplyCode())) {
                     throw new BuildException("could not set transfer type: " +
                         ftp.getReplyString());
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
index ad907e4c9..77e50dc0e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/TelnetTask.java
@@ -1,7 +1,7 @@
 /*
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2000,2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2000,2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
 
 package org.apache.tools.ant.taskdefs.optional.net;
 
-import com.oroinc.net.telnet.TelnetClient;
+import org.apache.commons.net.telnet.TelnetClient;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -305,8 +305,9 @@ public class TelnetTask extends Task {
 
     /**
      *  This class handles the abstraction of the telnet protocol.
-     *  Currently it is a wrapper around <a href="www.oroinc.com">ORO</a>'s
-     *  NetComponents
+     *  Currently it is a wrapper around <a
+     *  href="http://jakarta.apache.org/commons/net/index.html">Jakarta
+     *  Commons Net</a>.
      */
     public class AntTelnetClient extends TelnetClient {
         /**