diff --git a/src/main/org/apache/tools/ant/taskdefs/Javac.java b/src/main/org/apache/tools/ant/taskdefs/Javac.java
index 8b2a81dc3..ff9526b90 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -727,7 +727,7 @@ public class Javac extends MatchingTask {
         if (jExecutable.exists() && !Os.isFamily("netware")) {
             return jExecutable.getAbsolutePath();
         } else {
-            return "javac";
+            return "javac" + extension;
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index ceb51899f..888b997d6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1367,10 +1367,11 @@ public class Javadoc extends Task {
             return jdocExecutable.getAbsolutePath();
         } else {
             if (!Os.isFamily("netware")) {
-                log( "Unable to locate " + jdocExecutable.getAbsolutePath() +
-                     ". Using \"javadoc\" instead.", Project.MSG_VERBOSE );
+                log( "Unable to locate " + jdocExecutable.getAbsolutePath()
+                     + ". Using \"javadoc" + extension
+                     + "\" instead.", Project.MSG_VERBOSE );
             }
-            return "javadoc";
+            return "javadoc" + extension;
         }
     }
 
diff --git a/src/main/org/apache/tools/ant/types/CommandlineJava.java b/src/main/org/apache/tools/ant/types/CommandlineJava.java
index 0014f651d..449977ea4 100644
--- a/src/main/org/apache/tools/ant/types/CommandlineJava.java
+++ b/src/main/org/apache/tools/ant/types/CommandlineJava.java
@@ -389,7 +389,7 @@ public class CommandlineJava implements Cloneable {
             // <JTULLEY@novell.com>
             return jExecutable.getAbsolutePath();
         } else {
-            return "java";
+            return "java" + extension;
         }
     }