diff --git a/WHATSNEW b/WHATSNEW
index d606b94c4..0d8098046 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -239,6 +239,8 @@ Other changes:
 * Try to make subprojects of custom Project subclasses instances of the
   same type. Bugzilla report 17901.
 
+* <ssh> and <scp> support keyboard-interactive authentication now.
+
 Changes from Ant 1.6.4 to Ant 1.6.5
 ===================================
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
index 7b501a2fc..b4fff01ef 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ssh/SSHUserInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2003-2004 The Apache Software Foundation
+ * Copyright  2003-2005 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -18,10 +18,11 @@
 package org.apache.tools.ant.taskdefs.optional.ssh;
 
 import com.jcraft.jsch.UserInfo;
+import com.jcraft.jsch.UIKeyboardInteractive;
 
 /**
  */
-public class SSHUserInfo implements UserInfo {
+public class SSHUserInfo implements UserInfo, UIKeyboardInteractive {
 
     private String name;
     private String password = null;
@@ -167,5 +168,18 @@ public class SSHUserInfo implements UserInfo {
     public void showMessage(String message) {
         //log(message, Project.MSG_DEBUG);
     }
+    
+    public String[] promptKeyboardInteractive(String destination,
+                                              String name,
+                                              String instruction,
+                                              String[] prompt,
+                                              boolean[] echo) {
+    	if (prompt.length != 1 || echo[0] != false || this.password == null) {
+            return null;
+    	}
+    	String[] response=new String[1];
+    	response[0]=this.password;
+    	return response;
+    }
 
 }