diff --git a/build.xml b/build.xml
index 1d24b1bf1..f5bd69d09 100644
--- a/build.xml
+++ b/build.xml
@@ -521,6 +521,10 @@
       </and>
     </condition>
    <echo level="verbose"> csc.found=${csc.found}</echo>
+
+    <available property="rhino.present"
+               classname="org.mozilla.javascript.Scriptable"
+               classpathref="classpath"/>
   </target>
 
 
@@ -1491,6 +1495,10 @@
                    unless="some.regexp.support"/>
           <exclude name="${optional.package}/sitraka/*.java"
                    unless="some.regexp.support"/>
+          <exclude name="${optional.package}/RhinoScriptTest.java"
+                   unless="bsf.present"/>
+          <exclude name="${optional.package}/RhinoScriptTest.java"
+                   unless="rhino.present"/>
 
           <!-- fail if testcases can be loaded from the system classloader -->
           <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
diff --git a/src/etc/testcases/taskdefs/optional/script.xml b/src/etc/testcases/taskdefs/optional/script.xml
new file mode 100644
index 000000000..b417453db
--- /dev/null
+++ b/src/etc/testcases/taskdefs/optional/script.xml
@@ -0,0 +1,42 @@
+<project name="testproject" default="def" basedir=".">
+
+  <target name="def">
+    <fail>This build-file is intended to be run from the test cases</fail>
+  </target>
+
+  <target name="setup1">
+
+    <script language="javascript"> <![CDATA[
+
+      for (i=1; i<=10; i++) {
+        echo = testproject.createTask("echo");
+        setup1.addTask(echo);
+        echo.setMessage(i*i);
+      }
+
+    ]]> </script>
+
+  </target>
+
+  <target name="example1" depends="setup1"/>
+
+  <target name="sub">
+    <echo id="theEcho"/>
+  </target>
+
+  <target name="sub1">
+    <script language="javascript"><![CDATA[
+      theEcho.setMessage("In sub1");
+      sub.execute();
+    ]]></script>
+  </target>
+
+  <target name="sub2">
+    <script language="javascript"><![CDATA[
+      theEcho.setMessage("In sub2");
+      sub.execute();
+    ]]></script>
+  </target>
+
+  <target name="example2" depends="sub1,sub2"/>
+</project>
\ No newline at end of file
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
new file mode 100644
index 000000000..495cd174a
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/RhinoScriptTest.java
@@ -0,0 +1,106 @@
+/*
+ *  The Apache Software License, Version 1.1
+ *
+ *  Copyright (c) 2002 The Apache Software Foundation.  All rights
+ *  reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions
+ *  are met:
+ *
+ *  1. Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *  2. Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in
+ *  the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *  3. The end-user documentation included with the redistribution, if
+ *  any, must include the following acknowlegement:
+ *  "This product includes software developed by the
+ *  Apache Software Foundation (http://www.apache.org/)."
+ *  Alternately, this acknowlegement may appear in the software itself,
+ *  if and wherever such third-party acknowlegements normally appear.
+ *
+ *  4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *  Foundation" must not be used to endorse or promote products derived
+ *  from this software without prior written permission. For written
+ *  permission, please contact apache@apache.org.
+ *
+ *  5. Products derived from this software may not be called "Apache"
+ *  nor may "Apache" appear in their names without prior written
+ *  permission of the Apache Group.
+ *
+ *  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ *  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *  DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ *  ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ *  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ *  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ *  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ *  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ *  SUCH DAMAGE.
+ *  ====================================================================
+ *
+ *  This software consists of voluntary contributions made by many
+ *  individuals on behalf of the Apache Software Foundation.  For more
+ *  information on the Apache Software Foundation, please see
+ *  <http://www.apache.org/>.
+ */
+package org.apache.tools.ant.taskdefs.optional;
+
+import org.apache.tools.ant.BuildFileTest;
+
+/**
+ * Tests the examples of the &lt;script&gt; task docs.
+ *
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
+ * @since Ant 1.5.2
+ */
+public class RhinoScriptTest extends BuildFileTest {
+
+    public RhinoScriptTest(String name) {
+        super(name);
+    }
+
+    /**
+     * The JUnit setup method
+     */
+    public void setUp() {
+        configureProject("src/etc/testcases/taskdefs/optional/script.xml");
+    }
+
+    public void testExample1() {
+        executeTarget("example1");
+        int index = getLog().indexOf("1");
+        assertTrue(index > -1);
+        index = getLog().indexOf("4", index);
+        assertTrue(index > -1);
+        index = getLog().indexOf("9", index);
+        assertTrue(index > -1);
+        index = getLog().indexOf("16", index);
+        assertTrue(index > -1);
+        index = getLog().indexOf("25", index);
+        assertTrue(index > -1);
+        index = getLog().indexOf("36", index);
+        assertTrue(index > -1);
+        index = getLog().indexOf("49", index);
+        assertTrue(index > -1);
+        index = getLog().indexOf("64", index);
+        assertTrue(index > -1);
+        index = getLog().indexOf("81", index);
+        assertTrue(index > -1);
+        index = getLog().indexOf("100", index);
+        assertTrue(index > -1);
+    }
+
+    public void testExample2() {
+        executeTarget("example2");
+        assertTrue(getLog().indexOf("In sub1") > -1);
+        assertTrue(getLog().indexOf("In sub2") > -1);
+    }
+}