diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
index d44ec63b2..4af8d59c6 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Script.java
@@ -58,7 +58,7 @@ public class Script extends Task {
         runner.addBean("project", getProject());
         runner.addBean("self", this);
 
-        runner.executeScript("<ANT>");
+        runner.executeScript("ANT");
     }
 
     /**
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
index 29435252f..5738709fc 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/script/ScriptDef.java
@@ -314,7 +314,7 @@ public class ScriptDef extends DefBase {
         runner.addBean("attributes", attributes);
         runner.addBean("elements", elements);
         runner.addBean("project", getProject());
-        runner.executeScript("scriptdef <" + name + ">");
+        runner.executeScript("scriptdef_" + name);
     }
 
 
diff --git a/src/main/org/apache/tools/ant/util/ScriptRunner.java b/src/main/org/apache/tools/ant/util/ScriptRunner.java
index a162ce36e..53b0405c4 100644
--- a/src/main/org/apache/tools/ant/util/ScriptRunner.java
+++ b/src/main/org/apache/tools/ant/util/ScriptRunner.java
@@ -33,6 +33,19 @@ import java.util.Iterator;
  * @author Conor MacNeill
  */
 public class ScriptRunner {
+
+    // Register Groovy ourselves, since BSF does not
+    // natively support it (yet).
+    // This "hack" can be removed once BSF has been
+    // modified to support Groovy or more dynamic
+    // registration.
+    static {
+        BSFManager.registerScriptingEngine(
+            "groovy",
+            "org.codehaus.groovy.bsf.GroovyEngine",
+            new String[] {"groovy", "gy"});
+    }
+
     /** Script language */
     private String language;