diff --git a/config/alfresco/script-services-context.xml b/config/alfresco/script-services-context.xml
index c6e0a4667a..92e659f9c3 100644
--- a/config/alfresco/script-services-context.xml
+++ b/config/alfresco/script-services-context.xml
@@ -102,6 +102,9 @@
     <bean id="searchScript" parent="baseJavaScriptExtension" class="org.alfresco.repo.jscript.Search">
         <property name="extensionName">
             <value>search</value>
+        </property>
+        <property name="searchSubsystem">
+            <value>${index.subsystem.name}</value>
         </property>        
         <property name="serviceRegistry">
             <ref bean="ServiceRegistry"/>
diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java
index 8745edf3a1..25cdcd71c5 100644
--- a/source/java/org/alfresco/repo/jscript/Search.java
+++ b/source/java/org/alfresco/repo/jscript/Search.java
@@ -77,6 +77,7 @@ public class Search extends BaseScopableProcessorExtension
     /** Repository helper */
     protected Repository repository;
 
+    private String searchSubsystem;
 
     /**
      * Set the default store reference
@@ -112,10 +113,19 @@ public class Search extends BaseScopableProcessorExtension
     {
         this.repository = repository;
     }
-
+    
+    public void setSearchSubsystem(String searchSubsystem)
+    {
+        this.searchSubsystem = searchSubsystem;
+    }
     
     // JavaScript API
     
+    public String getSearchSubsystem()
+    {
+        return searchSubsystem;
+    }
+    
     /**
      * Find a single Node by the Node reference
      *