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 8e5b691dd..a41901222 100644
--- a/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
@@ -152,6 +152,9 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
         }
 
         if (includeJavaRuntime) {
+            // XXX move this stuff to a separate class, code is identical to
+            //     code in ../rmic/DefaultRmicAdapter
+
             if (System.getProperty("java.vendor").toLowerCase().indexOf("microsoft") >= 0) {
                 // Pull in *.zip from packages directory
                 FileSet msZipFiles = new FileSet();
@@ -178,6 +181,18 @@ public abstract class DefaultCompilerAdapter implements CompilerAdapter {
                                                 + File.separator +"jre"
                                                 + File.separator + "lib"
                                                 + File.separator + "rt.jar"));
+
+                // Added for MacOS X
+                classpath.addExisting(new Path(null,
+                                               System.getProperty("java.home")
+                                               + File.separator + ".."
+                                               + File.separator + "Classes"
+                                               + File.separator + "classes.jar"));
+                classpath.addExisting(new Path(null,
+                                               System.getProperty("java.home")
+                                               + File.separator + ".."
+                                               + File.separator + "Classes"
+                                               + File.separator + "ui.jar"));
             }
         }
             
diff --git a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
index 6b1a14da1..ce68e333e 100644
--- a/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
+++ b/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
@@ -143,6 +143,9 @@ public abstract class DefaultRmicAdapter implements RmicAdapter {
         }
 
         if (attributes.getIncludejavaruntime()) {
+            // XXX move this stuff to a separate class, code is identical to
+            //     code in ../compiler/DefaultCompilerAdapter
+
             if (System.getProperty("java.vendor").toLowerCase().indexOf("microsoft") >= 0) {
                 // Pull in *.zip from packages directory
                 FileSet msZipFiles = new FileSet();
@@ -176,6 +179,18 @@ public abstract class DefaultRmicAdapter implements RmicAdapter {
                                                 + File.separator +"jre"
                                                 + File.separator + "lib"
                                                 + File.separator + "rt.jar"));
+
+                // Added for MacOS X
+                classpath.addExisting(new Path(null,
+                                               System.getProperty("java.home")
+                                               + File.separator + ".."
+                                               + File.separator + "Classes"
+                                               + File.separator + "classes.jar"));
+                classpath.addExisting(new Path(null,
+                                               System.getProperty("java.home")
+                                               + File.separator + ".."
+                                               + File.separator + "Classes"
+                                               + File.separator + "ui.jar"));
             }
         }
         return classpath;