diff --git a/help/help-tool/pom.xml b/help/help-tool/pom.xml
index 0697b19fae66..d1989824fbf4 100644
--- a/help/help-tool/pom.xml
+++ b/help/help-tool/pom.xml
@@ -29,8 +29,8 @@
       <artifactId>sakai-component-manager</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.sakaiproject.jsf</groupId>
-      <artifactId>jsf-tool-sun</artifactId>
+      <groupId>org.sakaiproject.jsf2</groupId>
+      <artifactId>jsf2-tool-sun</artifactId>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -57,6 +57,11 @@
 				<groupId>org.apache.commons</groupId>
 				<artifactId>commons-lang3</artifactId>
 		</dependency>
+    <dependency>
+      <groupId>org.jboss.weld.servlet</groupId>
+      <artifactId>weld-servlet-shaded</artifactId>
+      <version>${sakai.weld.shaded.version}</version>
+    </dependency>
   </dependencies>
   <build>
     <resources>
diff --git a/help/help-tool/src/java/org/sakaiproject/jsf/help/ContextSensitiveTreeRender.java b/help/help-tool/src/java/org/sakaiproject/jsf/help/ContextSensitiveTreeRender.java
index 502099645ca3..008e93e39495 100644
--- a/help/help-tool/src/java/org/sakaiproject/jsf/help/ContextSensitiveTreeRender.java
+++ b/help/help-tool/src/java/org/sakaiproject/jsf/help/ContextSensitiveTreeRender.java
@@ -40,7 +40,7 @@
 import org.sakaiproject.api.app.help.Resource;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.component.api.ServerConfigurationService;
-import org.sakaiproject.jsf.util.LocaleUtil;
+import org.sakaiproject.jsf2.util.LocaleUtil;
 
 /**
  * render response
diff --git a/help/help-tool/src/java/org/sakaiproject/tool/help/HelpJsfTool.java b/help/help-tool/src/java/org/sakaiproject/tool/help/HelpJsfTool.java
index 98accfc62daf..6a9e98d3a633 100644
--- a/help/help-tool/src/java/org/sakaiproject/tool/help/HelpJsfTool.java
+++ b/help/help-tool/src/java/org/sakaiproject/tool/help/HelpJsfTool.java
@@ -30,7 +30,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.sakaiproject.component.cover.ServerConfigurationService;
-import org.sakaiproject.jsf.util.JsfTool;
+import org.sakaiproject.jsf2.util.JsfTool;
 import org.sakaiproject.util.Web;
 
 /**
diff --git a/help/help-tool/src/webapp/META-INF/context.xml b/help/help-tool/src/webapp/META-INF/context.xml
new file mode 100644
index 000000000000..79267c9d6fdb
--- /dev/null
+++ b/help/help-tool/src/webapp/META-INF/context.xml
@@ -0,0 +1,6 @@
+<Context>
+    <Resource name="BeanManager"
+              auth="Container"
+              type="javax.enterprise.inject.spi.BeanManager"
+              factory="org.jboss.weld.resources.ManagerObjectFactory" />
+</Context>
\ No newline at end of file
diff --git a/help/help-tool/src/webapp/TOCDisplay/main.jsp b/help/help-tool/src/webapp/TOCDisplay/main.jsp
index 3877fa3158f1..aab5fc91589a 100644
--- a/help/help-tool/src/webapp/TOCDisplay/main.jsp
+++ b/help/help-tool/src/webapp/TOCDisplay/main.jsp
@@ -2,7 +2,7 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%-- Custom tag library just for this tool --%>
 <%@ taglib uri="http://sakaiproject.org/jsf/help" prefix="help" %>
 
diff --git a/help/help-tool/src/webapp/WEB-INF/beans.xml b/help/help-tool/src/webapp/WEB-INF/beans.xml
new file mode 100644
index 000000000000..51e8caf9f902
--- /dev/null
+++ b/help/help-tool/src/webapp/WEB-INF/beans.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+       bean-discovery-mode="all" version="2.0">
+</beans>
\ No newline at end of file
diff --git a/help/help-tool/src/webapp/WEB-INF/faces-config.xml b/help/help-tool/src/webapp/WEB-INF/faces-config.xml
index 3a8a9c43be76..265eb6802b4e 100644
--- a/help/help-tool/src/webapp/WEB-INF/faces-config.xml
+++ b/help/help-tool/src/webapp/WEB-INF/faces-config.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-<faces-config>
+<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+			  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
+        http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_3.xsd"
+			  version="2.3">
 
 	<application>
 		<message-bundle>
diff --git a/help/help-tool/src/webapp/WEB-INF/web.xml b/help/help-tool/src/webapp/WEB-INF/web.xml
index ba8019422d57..7ccf521cb7dc 100644
--- a/help/help-tool/src/webapp/WEB-INF/web.xml
+++ b/help/help-tool/src/webapp/WEB-INF/web.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 
-<web-app id="WebApp_9" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+        version="3.0">
     <display-name>sakai-help</display-name>
     <description>Sakai Help Tool</description>
 
diff --git a/help/help-tool/src/webapp/main.jsp b/help/help-tool/src/webapp/main.jsp
index b91a6431adb4..d1ba2ce1d1ac 100644
--- a/help/help-tool/src/webapp/main.jsp
+++ b/help/help-tool/src/webapp/main.jsp
@@ -3,7 +3,7 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%-- Custom tag library just for this tool --%>
 <%@ taglib uri="http://sakaiproject.org/jsf/help" prefix="help" %>
 
diff --git a/help/help-tool/src/webapp/question/display.jsp b/help/help-tool/src/webapp/question/display.jsp
index 3892a7215883..ee81fdc51f55 100644
--- a/help/help-tool/src/webapp/question/display.jsp
+++ b/help/help-tool/src/webapp/question/display.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 
 <f:view>	
 	<sakai:view_container title="#{msgs.title_edit}">
diff --git a/help/help-tool/src/webapp/question/main.jsp b/help/help-tool/src/webapp/question/main.jsp
index e695f936d6bd..694ab2dedcf8 100644
--- a/help/help-tool/src/webapp/question/main.jsp
+++ b/help/help-tool/src/webapp/question/main.jsp
@@ -1,6 +1,6 @@
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 
 <f:view>	
 	<sakai:view_container title="#{msgs.title_edit}">
diff --git a/help/help-tool/src/webapp/search/main.jsp b/help/help-tool/src/webapp/search/main.jsp
index 3bbb17b3536c..e15156c579bc 100644
--- a/help/help-tool/src/webapp/search/main.jsp
+++ b/help/help-tool/src/webapp/search/main.jsp
@@ -2,7 +2,7 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %> 
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%-- Custom tag library just for this tool --%>
 <%@ taglib uri="http://sakaiproject.org/jsf/help" prefix="help" %>
 <%
diff --git a/help/help-tool/src/webapp/tableOfContents/main.jsp b/help/help-tool/src/webapp/tableOfContents/main.jsp
index 1fd942baea69..61423fc9b35c 100644
--- a/help/help-tool/src/webapp/tableOfContents/main.jsp
+++ b/help/help-tool/src/webapp/tableOfContents/main.jsp
@@ -2,7 +2,7 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
 <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
 <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://sakaiproject.org/jsf/sakai" prefix="sakai" %>
+<%@ taglib uri="http://sakaiproject.org/jsf2/sakai" prefix="sakai" %>
 <%-- Custom tag library just for this tool --%>
 <%@ taglib uri="http://sakaiproject.org/jsf/help" prefix="help" %>