diff --git a/docs/manual/clonevm.html b/docs/manual/clonevm.html
index bbd9d9743..2a2ceb4c6 100644
--- a/docs/manual/clonevm.html
+++ b/docs/manual/clonevm.html
@@ -18,16 +18,19 @@ href="OptionalTasks/junit.html">junit</a> tasks support clonevm
 attributes to control the VMs on a task-by-task basis while the system
 property applies to all forked Java VMs.</p>
 
-<p>If the value of the property is true, then all system properties
-and the bootclasspath of the forked Java Virtual Machine will be the
-same as those of the Java VM running Ant.</p>
+<p>If the value of the property is true, then all system properties of
+the forked Java Virtual Machine will be the same as those of the Java
+VM running Ant.  In addition, if you set build.clonevm to true and <a
+href="sysclasspath.html">build.sysclasspath</a> has not been set, the
+bootclasspath of forked Java VMs gets constructed as if
+build.sysclasspath had the value "last".</p>
 
 <p>Note that this has to be a system property, so it cannot be
 specified on the Ant command line.  Use the ANT_OPTS environment
 variable instead.</p>
 
 <hr>
-<p align="center">Copyright &copy; 2004 The Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2004-2005 The Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 </html>
diff --git a/docs/manual/sysclasspath.html b/docs/manual/sysclasspath.html
index c0fc45eec..8a102381f 100644
--- a/docs/manual/sysclasspath.html
+++ b/docs/manual/sysclasspath.html
@@ -51,8 +51,14 @@ the other form of compromise where the build runner has priority.
 </tr>
 </table>
 
+<p><em>Since Ant 1.7</em> the value of this property also affects the
+bootclasspath settings - it combines the bootclasspath that has been
+specified for a task with the bootclasspath of the Java VM running
+Ant.  If the property has not been set, it defaults to "ignore" in
+this case.</p>
+
 <hr>
-<p align="center">Copyright &copy; 2001-2002,2004 The Apache Software Foundation. All rights
+<p align="center">Copyright &copy; 2001-2002,2004-2005 The Apache Software Foundation. All rights
 Reserved.</p>
 </body>
 </html>
diff --git a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
index 68e445c03..794dbb02a 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1669,9 +1669,14 @@ public class Javadoc extends Task {
                     }
                 }
             }
-            if (bootclasspath != null && bootclasspath.size() > 0) {
+            Path bcp = new Path(getProject());
+            if (bootclasspath != null) {
+                bcp.append(bootclasspath);
+            }
+            bcp = bcp.concatSystemBootClasspath("ignore");
+            if (bcp.size() > 0) {
                 toExecute.createArgument().setValue("-bootclasspath");
-                toExecute.createArgument().setPath(bootclasspath);
+                toExecute.createArgument().setPath(bcp);
             }
 
             // add the links arguments
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
index 93816f051..48b866543 100755
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
@@ -1,5 +1,5 @@
 /*
- * Copyright  2000-2004 The Apache Software Foundation
+ * Copyright  2000-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.
@@ -385,9 +385,14 @@ public class Javah extends Task {
             }
             cmd.createArgument().setValue("-stubs");
         }
+        Path bcp = new Path(getProject());
         if (bootclasspath != null) {
+            bcp.append(bootclasspath);
+        }
+        bcp = bcp.concatSystemBootClasspath("ignore");
+        if (bcp.size() > 0) {
             cmd.createArgument().setValue("-bootclasspath");
-            cmd.createArgument().setPath(bootclasspath);
+            cmd.createArgument().setPath(bcp);
         }
 
         logAndAddFilesToCompile(cmd);