diff --git a/plugins/org.eclipse.jst.server.generic.jboss/plugin.properties b/plugins/org.eclipse.jst.server.generic.jboss/plugin.properties
index cabd11e..39ca5b8 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/plugin.properties
+++ b/plugins/org.eclipse.jst.server.generic.jboss/plugin.properties
@@ -31,11 +31,11 @@
 Provides basic server functionality.
 
 jboss42runtimeTypeName=JBoss v4.2
-jboss42runtimeTypeDescription=Publishes and runs J2EE 1.4 modules on a local server. \
+jboss42runtimeTypeDescription=Publishes and runs J2EE 1.4 and 5.0 modules on a local server. \
 Provides basic server functionality.
 
 jboss42serverTypeName=JBoss v4.2
-jboss42serverTypeDescription=Publishes and runs J2EE 1.4 modules on a local server. \
+jboss42serverTypeDescription=Publishes and runs J2EE 1.4 and 5.0 modules on a local server. \
 Provides basic server functionality.
 
 jboss5runtimeTypeName=JBoss v5.0
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/plugin.xml b/plugins/org.eclipse.jst.server.generic.jboss/plugin.xml
index df1e077..5a91bb0 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/plugin.xml
+++ b/plugins/org.eclipse.jst.server.generic.jboss/plugin.xml
@@ -60,13 +60,13 @@
 	       class="org.eclipse.jst.server.generic.core.internal.GenericServerRuntime">
 	       <moduleType
 	         types="jst.web"
-	         versions="2.2, 2.3, 2.4"/>
+	         versions="2.2, 2.3, 2.4, 2.5"/>
 	      <moduleType
 	         types="jst.ejb"
 	         versions="1.1, 2.0, 2.1, 3.0"/>
 	      <moduleType
 	         types="jst.ear"
-	         versions="1.2, 1.3, 1.4"/>
+	         versions="1.2, 1.3, 1.4, 5.0"/>
 	      <moduleType
 	         types="jst.connector"
 	         versions="1.0, 1.5"/>
@@ -337,19 +337,19 @@
          version="4.2"/>
       <facet
          id="jst.web"
-         version="2.2,2.3,2.4"/>
+         version="2.2,2.3,2.4,2.5"/>
       <facet
          id="jst.ejb"
          version="1.1,2.0,2.1,3.0"/>
       <facet
          id="jst.ear"
-         version="1.2,1.3,1.4"/>
+         version="1.2,1.3,1.4,5.0"/>
       <facet
          id="jst.connector"
          version="1.0,1.5"/>
       <facet
          id="jst.appclient"
-         version="1.2,1.3,1.4"/>
+         version="1.2,1.3,1.4,5.0"/>
       <facet
          id="jst.utility"
          version="1.0"/>
@@ -373,7 +373,7 @@
          version="1.0,1.5"/>
       <facet
          id="jst.appclient"
-         version="1.2,1.3,1.4"/>
+         version="1.2,1.3,1.4,5.0"/>
       <facet
          id="jst.utility"
          version="1.0"/>
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/servers/jboss42.serverdef b/plugins/org.eclipse.jst.server.generic.jboss/servers/jboss42.serverdef
index bde83ed..0151f25 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/servers/jboss42.serverdef
+++ b/plugins/org.eclipse.jst.server.generic.jboss/servers/jboss42.serverdef
@@ -116,6 +116,9 @@
 	    <fileset dir="${serverRootDirectory}">
 	       <include name="client/*.jar" />
 	       <include name="server/default/lib/*.jar" />
+
+	       <!-- JSF Libraries -->
+	       <include name="server/default/deploy/jboss-web.deployer/jsf-libs/*.jar />
 	       
 	       <!-- This will be ignored if EJB3 is not there 4.0.x 4.2 -->
 	       <include name="server/default/deploy/jboss-aop-jdk50.deployer/*.jar" />
@@ -124,9 +127,10 @@
 	       <!-- This will be ignored if EJB3 is not there 5.0 -->
 	       <include name="lib/*.jar" />
 	       <include name="server/default/deployers/jbossweb.deployer/*.jar" />
+	       <include name="server/default/deployers/jbossweb.deployer/jsf-libs/*.jar" />
 	       <include name="server/default/deployers/jboss-aop-jboss5.deployer/*.jar" />
 		   <include name="server/default/deployers/ejb3.deployer/jboss-annotations-ejb3.jar" />
-	       
+	       	       
 	       <!-- for validation to work this library is defined as an archive -->
 	       <exclude name="server/default/lib/mail.jar" />
 	    </fileset>
diff --git a/plugins/org.eclipse.jst.server.generic.jboss/servers/jboss5.serverdef b/plugins/org.eclipse.jst.server.generic.jboss/servers/jboss5.serverdef
index 93355e2..ba702b2 100644
--- a/plugins/org.eclipse.jst.server.generic.jboss/servers/jboss5.serverdef
+++ b/plugins/org.eclipse.jst.server.generic.jboss/servers/jboss5.serverdef
@@ -116,7 +116,8 @@
 	    <fileset dir="${serverRootDirectory}">
 	       <include name="client/*.jar" />
 	       <include name="server/default/lib/*.jar" />
-	       
+	       	       
+	       <include name="server/default/deployers/jbossweb.deployer/jsf-libs/*.jar" />	       
 
 	       <!-- This will be ignored if EJB3 is not there 5.0 -->
 	       <include name="lib/*.jar" />