diff --git a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
index 7c7b7e0c1..18b9dd82f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -68,7 +68,6 @@ import java.io.File;
 import java.io.PrintWriter;
 import java.io.FileWriter;
 import java.io.IOException;
-import java.util.Locale;
 import java.util.Random;
 
 /**
diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java
index 05a301fe5..562471f0b 100644
--- a/src/main/org/apache/tools/ant/types/Path.java
+++ b/src/main/org/apache/tools/ant/types/Path.java
@@ -528,6 +528,14 @@ public class Path extends DataType implements Cloneable {
             msZipFiles.setDir(new File(System.getProperty("java.home") + File.separator + "Packages"));
             msZipFiles.setIncludes("*.ZIP");
             addFileset(msZipFiles);
+        } else if(System.getProperty("java.vm.name").equals("Kaffe")) {
+            FileSet kaffeJarFiles = new FileSet();
+            kaffeJarFiles.setDir(new File(System.getProperty("java.home") 
+                                          + File.separator + "share"
+                                          + File.separator + "kaffe"));
+            
+            kaffeJarFiles.setIncludes("*.jar");
+            addFileset(kaffeJarFiles);
         }
         else if (Project.getJavaVersion() == Project.JAVA_1_1) {
             addExisting(new Path(null,