diff --git a/config/alfresco/application-context.xml b/config/alfresco/application-context.xml
index 5bf10fb2e7..b1194fce7e 100644
--- a/config/alfresco/application-context.xml
+++ b/config/alfresco/application-context.xml
@@ -70,8 +70,10 @@
     -->
     <import resource="classpath*:alfresco/module-context.xml" />
 
+    <!--  Import Spring WebScripts framework beans -->
+    <import resource="classpath*:org/springframework/extensions/webscripts/*-context.xml" />
+
     <!--  Import client beans -->
-    <import resource="classpath*:alfresco/webscript-framework-application-context.xml" />
     <import resource="classpath*:alfresco/web-client-application-context.xml" />
 
     <!--
diff --git a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
index 745902bb24..edd3f6eeec 100644
--- a/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
+++ b/source/java/org/alfresco/repo/jscript/RhinoScriptProcessor.java
@@ -64,7 +64,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.util.FileCopyUtils;
 
 /**
- * Implementation of the ScriptEninge using the Rhino JavaScript engine.
+ * Implementation of the ScriptProcessor using the Rhino JavaScript library.
  * 
  * @author Kevin Roast
  */