diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/searchengines.get.atom.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/searchengines.get.atom.ftl
index bae870b070..b5844d80d6 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/searchengines.get.atom.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/searchengines.get.atom.ftl
@@ -11,9 +11,9 @@
 <#list engines as engine>
   <entry>
     <title>${engine.label}</title>
-    <link rel="alternate" type="${engine.type}" href="${absurl(url.context)}${engine.url)?xml}" title="${engine.label}"/>
+    <link rel="alternate" type="${engine.type}" href="${absurl(url.serviceContext)}${engine.url?xml}" title="${engine.label}"/>
     <summary><#if engine.urlType == "description">OpenSearch Description<#else>Template URL</#if> - ${engine.type}</summary>
-    <id>${absurl(url.context)}${engine.url)?xml}</id>
+    <id>${absurl(url.serviceContext)}${engine.url?xml}</id>
     <updated>${xmldate(date)}</updated>
   </entry>
 </#list>
diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/searchengines.get.html.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/searchengines.get.html.ftl
index c356b0514b..6272df1394 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/searchengines.get.html.ftl
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/searchengines.get.html.ftl
@@ -6,7 +6,7 @@
     <title>Alfresco Registered Search Engines</title>
 <#list engines as engine>
 <#if engine.urlType == "description">
-    <link rel="search" type="${engine.type}" href="${url.context}${engine.url}" title="${engine.label}">
+    <link rel="search" type="${engine.type}" href="${url.serviceContext}${engine.url}" title="${engine.label}">
 </#if>
 </#list>
   </head>
@@ -22,7 +22,7 @@
       <tr align="left"><td><b>Engine<td><b>URL Type<td><b>Response Format</tr>
 <#list engines as engine>
       <tr align="left">
-        <td><a href="${url.context}${engine.url}">${engine.label}</a>
+        <td><a href="${url.serviceContext}${engine.url}">${engine.label}</a>
         <td><#if engine.urlType == "description">OpenSearch Description<#else>Template URL</#if>
         <td>${engine.type}
       </tr>
diff --git a/config/alfresco/web-scripts-config.xml b/config/alfresco/web-scripts-config.xml
index c5e4fc3941..6a9bad0d00 100644
--- a/config/alfresco/web-scripts-config.xml
+++ b/config/alfresco/web-scripts-config.xml
@@ -26,16 +26,16 @@
          
             <engine label-id="current_repo" label="Alfresco Keyword Search">
                <url type="application/opensearchdescription+xml">
-                  /service/api/search/keyword/description.xml
+                  /api/search/keyword/description.xml
                </url>
                <url type="application/atom+xml">
-                  /service/api/search/keyword.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
+                  /api/search/keyword.atom?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
                </url>
                <url type="application/rss+xml">
-                  /service/api/search/keyword.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
+                  /api/search/keyword.rss?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
                </url>
                <url type="text/html">
-                  /service/api/search/keyword?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
+                  /api/search/keyword?q={searchTerms}&amp;p={startPage?}&amp;c={count?}&amp;l={language?}&amp;guest={alf:guest?}
                </url>
             </engine>
 
@@ -43,7 +43,7 @@
          
          <proxy>
             <!--  URL of Search Engine proxy -->
-            <url>/service/api/search/engine</url>
+            <url>/api/search/engine</url>
          </proxy>
          
       </opensearch>
diff --git a/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java b/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
index 91040502f4..933180757f 100644
--- a/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
+++ b/source/java/org/alfresco/web/ui/repo/component/UIOpenSearch.java
@@ -303,7 +303,7 @@ public class UIOpenSearch extends SelfRenderingComponent
                {
                   if (url.startsWith("/"))
                   {
-                     url = context.getExternalContext().getRequestContextPath() + url;
+                     url = context.getExternalContext().getRequestContextPath() + "/wcservice" + url;
                   }
                           
                   // add the engine
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 300e16bd34..0e9c5db9b7 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -255,6 +255,15 @@
    <servlet>
       <servlet-name>apiServlet</servlet-name>
       <servlet-class>org.alfresco.web.scripts.WebScriptServlet</servlet-class>
+      <init-param>
+         <param-name>authenticator</param-name>
+         <param-value>webscripts.authenticator.basic</param-value>
+      </init-param>
+   </servlet>
+
+   <servlet>
+      <servlet-name>wcapiServlet</servlet-name>
+      <servlet-class>org.alfresco.web.scripts.WebScriptServlet</servlet-class>
       <init-param>
          <param-name>authenticator</param-name>
          <param-value>webscripts.authenticator.webclient</param-value>
@@ -381,6 +390,16 @@
       <url-pattern>/s/*</url-pattern>
    </servlet-mapping>
 
+   <servlet-mapping>
+      <servlet-name>wcapiServlet</servlet-name>
+      <url-pattern>/wcservice/*</url-pattern>
+   </servlet-mapping>
+   
+   <servlet-mapping>
+      <servlet-name>wcapiServlet</servlet-name>
+      <url-pattern>/wcs/*</url-pattern>
+   </servlet-mapping>
+
    <servlet-mapping>
       <servlet-name>proxyServlet</servlet-name>
       <url-pattern>/proxy</url-pattern>