diff --git a/source/web/WEB-INF/jboss-app.xml b/source/web/WEB-INF/jboss-app.xml
deleted file mode 100644
index eac8510c4f..0000000000
--- a/source/web/WEB-INF/jboss-app.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<jboss-app>
-   <app-name>alfresco</app-name>
-</jboss-app>
\ No newline at end of file
diff --git a/source/web/WEB-INF/jboss-web.xml b/source/web/WEB-INF/jboss-web.xml
index 9d9c645cc6..dde958affb 100644
--- a/source/web/WEB-INF/jboss-web.xml
+++ b/source/web/WEB-INF/jboss-web.xml
@@ -1,3 +1,12 @@
-<?xml version="1.0"?>
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+
 <jboss-web>
+   <resource-ref>
+      <res-ref-name>jdbc/dataSource</res-ref-name>
+      <jndi-name>java:alfresco-datasource</jndi-name>
+   </resource-ref>
 </jboss-web>
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 232a5c4f50..b6e0d952f2 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -70,6 +70,11 @@
       <param-value>/WEB-INF/web-application-context.xml</param-value>
       <description>Spring config file location</description>
    </context-param>
+   <context-param>
+      <param-name>contextClass</param-name>
+      <param-value>org.alfresco.config.JBossEnabledWebApplicationContext</param-value>
+      <description>Spring context class</description>
+   </context-param>
    <context-param>
       <param-name>log4jExposeWebAppRoot</param-name>
       <param-value>false</param-value>
@@ -586,6 +591,7 @@
       <description>The filesystem directory below which content and index data is stored. Should be on a shared disk
          if this is a clustered installation.</description>
       <env-entry-name>properties/dir.root</env-entry-name>
+      <env-entry-value/> <!-- Empty value included for JBoss compatibility -->
       <env-entry-type>java.lang.String</env-entry-type>
    </env-entry>
 
@@ -597,6 +603,7 @@
          org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect,
          org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect, org.hibernate.dialect.PostgreSQLDialect</description>
       <env-entry-name>properties/hibernate.dialect</env-entry-name>
+      <env-entry-value/> <!-- Empty value included for JBoss compatibility -->
       <env-entry-type>java.lang.String</env-entry-type>
    </env-entry>
 
@@ -604,6 +611,7 @@
       <description>Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to "true
          TRUE, false FALSE".</description>
       <env-entry-name>properties/hibernate.query.substitutions</env-entry-name>
+      <env-entry-value/> <!-- Empty value included for JBoss compatibility -->
       <env-entry-type>java.lang.String</env-entry-type>
    </env-entry>
 
@@ -612,6 +620,7 @@
          after insert. Requires JDBC3+ driver. Set to false if your driver has problems with the Hibernate identifier
          generators. By default, tries to determine the driver capabilities using connection metadata. </description>
       <env-entry-name>properties/hibernate.jdbc.use_get_generated_keys</env-entry-name>
+      <env-entry-value/> <!-- Empty value included for JBoss compatibility -->
       <env-entry-type>java.lang.Boolean</env-entry-type>
    </env-entry>
 
@@ -619,6 +628,7 @@
       <description>Qualify unqualified table names with the given schema/tablespace in generated SQL. It may be
          necessary to set this when the target database has more than one schema.</description>
       <env-entry-name>properties/hibernate.default_schema</env-entry-name>
+      <env-entry-value/> <!-- Empty value included for JBoss compatibility -->
       <env-entry-type>java.lang.String</env-entry-type>
    </env-entry>