diff --git a/build.xml b/build.xml
index fae4c2b00..b2fd92f17 100644
--- a/build.xml
+++ b/build.xml
@@ -241,11 +241,8 @@
 
   <selector id="needs.apache-bsf">
     <or>
-      <filename name="${optional.package}/Script*"/>
-      <filename name="${optional.package}/script/**/*"/>
-      <filename name="${optional.type.package}/*Script*"/>
-      <filename name="${util.package}/Script*"/>
-      <filename name="${util.package}/optional/Script*"/>
+      <filename name="${util.package}/ScriptRunner.*"/>
+      <filename name="${util.package}/optional/ScriptRunner*"/>
     </or>
   </selector>
 
diff --git a/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java b/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java
index a0b9ac5cd..60f043e74 100644
--- a/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java
+++ b/src/main/org/apache/tools/ant/types/optional/ScriptFilter.java
@@ -15,13 +15,14 @@
  *  limitations under the License.
  *
  */
+
 package org.apache.tools.ant.types.optional;
 
 import org.apache.tools.ant.filters.TokenFilter;
 import java.io.File;
 import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.util.optional.ScriptRunner;
-
+import org.apache.tools.ant.util.ScriptRunnerBase;
+import org.apache.tools.ant.util.ScriptRunnerHelper;
 
 /**
  * Most of this is CAP (Cut And Paste) from the Script task
@@ -40,7 +41,7 @@ public class ScriptFilter extends TokenFilter.ChainableReaderFilter {
     /** the token used by the script */
     private String token;
 
-    private ScriptRunner runner = new ScriptRunner();
+    private ScriptRunnerHelper runner = new ScriptRunnerHelper();
 
     /**
      * Defines the language (required).
@@ -61,7 +62,6 @@ public class ScriptFilter extends TokenFilter.ChainableReaderFilter {
             return;
         }
         initialized = true;
-        runner.bindToComponent(this);
     }
 
     /**
@@ -93,7 +93,9 @@ public class ScriptFilter extends TokenFilter.ChainableReaderFilter {
     public String filter(String token) {
         init();
         setToken(token);
-        runner.executeScript("ant_filter");
+        ScriptRunnerBase srb = runner.getScriptRunner();
+        srb.bindToComponent(this);
+        srb.executeScript("ant_filter");
         return getToken();
     }