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 b9af7bccd..10cc53618 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
@@ -92,7 +92,9 @@ public class TelnetTask extends Task {
        }
 
        /**  Create the telnet client object */
-       AntTelnetClient telnet = new AntTelnetClient();
+       AntTelnetClient telnet = null;
+       try {
+           telnet = new AntTelnetClient();
        try {
            telnet.connect(server, port);
        } catch (IOException e) {
@@ -111,6 +113,16 @@ public class TelnetTask extends Task {
            }
            task.execute(telnet);
        }
+       } finally {
+           if (telnet != null) {
+               try {
+                   telnet.disconnect();
+               } catch (IOException e) {
+                   throw new BuildException("Error disconnecting from " 
+                                            + server);
+               }
+           }
+       }
     }
 
     /**