diff --git a/WHATSNEW b/WHATSNEW
index fb4d2e514..0d1fd65b9 100644
--- a/WHATSNEW
+++ b/WHATSNEW
@@ -6,6 +6,14 @@ Changes that could break older environments:
 
 * Targets cannot have the empty string as their name any longer.
 
+* ant.jar's manifest does no longer include a Class-Path entry, so it
+  is no longer possible to run Ant via "java -jar ant.jar" without
+  manually altering the CLASSPATH.  Instead of that a file
+  ant-bootstrap.jar is included in the etc directory of the binary
+  distribution, copy this to the lib directory and use 
+  "java -jar ant-bootstrap.jar" instead if you want to run Ant without
+  the wrapper script (not recommended).
+
 Fixed bugs:
 -----------
 
diff --git a/build.xml b/build.xml
index e600c4c32..83c9a9e8b 100644
--- a/build.xml
+++ b/build.xml
@@ -22,6 +22,7 @@
   <property name="name" value="ant"/>
   <property name="version" value="1.6alpha"/>
   <property name="manifest-version" value="1.5.9"/>
+  <property name="bootstrap.jar" value="ant-bootstrap.jar"/>
 
   <property name="debug" value="true"/>
   <property name="chmod.fail" value="true"/>
@@ -737,6 +738,13 @@
       </manifest>
     </jar>
 
+    <jar destfile="${build.lib}/${bootstrap.jar}"
+         basedir="${build.classes}"
+         manifest="${manifest}.bootstrap">
+      <include name="${ant.package}/Main.class"/>
+      <metainf dir="${build.dir}" includes="LICENSE.txt"/>
+    </jar>
+
   </target>
 
   <!--   Creates jar of test utility classes -->
@@ -764,7 +772,9 @@
     <mkdir dir="${dist.lib}"/>
 
     <copy todir="${dist.lib}">
-      <fileset dir="${build.lib}"/>
+      <fileset dir="${build.lib}">
+        <exclude name="${bootstrap.jar}"/>
+      </fileset>
     </copy>
 
     <copy todir="${dist.bin}">
@@ -876,6 +886,9 @@
             <include name="log.xsl"/>
             <include name="tagdiff.xsl"/>
         </fileset>
+      <fileset dir="${build.lib}">
+        <include name="${bootstrap.jar}"/>
+      </fileset>
     </copy>
 
   </target>
diff --git a/src/etc/manifest b/src/etc/manifest
index 0098f953b..758bc0f0d 100644
--- a/src/etc/manifest
+++ b/src/etc/manifest
@@ -1,5 +1,4 @@
 Manifest-Version: 1.0
 Main-Class: org.apache.tools.ant.Main
-Class-Path: xml-apis.jar xercesImpl.jar optional.jar xalan.jar
 
 
diff --git a/src/etc/manifest.bootstrap b/src/etc/manifest.bootstrap
new file mode 100644
index 000000000..b663a416a
--- /dev/null
+++ b/src/etc/manifest.bootstrap
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Main-Class: org.apache.tools.ant.Main
+Class-Path: ant.jar xml-apis.jar xercesImpl.jar optional.jar xalan.jar
+
+