diff --git a/INSTALL.APPSERVER.README b/INSTALL.APPSERVER.README
index a8f55bce0fa62bbcad9acf5444aff00f9e70c3f2..a487aa0fe4556c860b71195562aafb69aefb5c51 100644
--- a/INSTALL.APPSERVER.README
+++ b/INSTALL.APPSERVER.README
@@ -20,7 +20,7 @@ and for Glassfish
 Configuration JBoss AS 7.1
 --------------------------
 
-1. I use a JBoss AS 7.1.1 with Hibernate upgraded to the latest version.
+1. I use a JBoss AS 7.1.1 with Hibernate upgraded to the latest version or JBoss AS 7.1.3.
 2. Define a JDBC connection pool in your standalone.xml configuration with a jndi-name like:
      java:jboss/datasources/OpenOLATDS and set this JNDI name
    in olat.local.properties set the following properties:
@@ -38,6 +38,29 @@ Configuration JBoss AS 7.1
      search.broker.jndi=java:jboss/exported/jms/queue/searchQueue
      index.broker.jndi=java:jboss/exported/jms/queue/indexQueue
      exam.broker.jndi=java:jboss/exported/jms/queue/examQueue
+4. In the databaseCoreContext.xml in the bean with id: hibernateCacheProps_enabled_Cluster
+   remove the properties "hibernate.cache.region.factory_class" and "hibernate.cache.infinispan.cachemanager"
+   set the two cache properties "hibernate.cache.use_query_cache" and "hibernate.cache.use_second_level_cache" to false
+     
+Configuration WildFly (JBoss AS 8.0)
+------------------------------------
+
+1. Define a JDBC connection pool in your standalone.xml configuration with a jndi-name like:
+     java:jboss/datasources/OpenOLATDS and set this JNDI name
+   in olat.local.properties set the following properties:
+     db.source=jndi
+     db.jndi=java:jboss/datasources/OpenOLATDS
+2. Create a queue with a jndi-name like:
+     java:jboss/exported/jms/queue/searchQueue
+   and a topic:
+     java:jboss/exported/jms/topic/sysbus
+   in olat.local.properties set the following properties:
+     jms.provider=jndi
+     jms.broker.jndi=java:/ConnectionFactory
+     sysbus.broker.jndi=java:jboss/exported/jms/topic/sysbus
+     search.broker.jndi=java:jboss/exported/jms/queue/searchQueue
+     index.broker.jndi=java:jboss/exported/jms/queue/indexQueue
+     exam.broker.jndi=java:jboss/exported/jms/queue/examQueue
 
 
 Configuration Glassfish 3.1
diff --git a/pom.xml b/pom.xml
index 8d4f2dd45844fac71e24c9b3177fcbf6002ba4ba..bb7388ac66dd41c897db48d730fc5a51037c8441 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,7 +423,14 @@
 
 		<profile>
 			<id>jbossas7</id>
-	
+			<dependencies>
+				<dependency>
+					<groupId>com.sun.jersey</groupId>
+					<artifactId>jersey-servlet</artifactId>
+					<version>${com.sun.jersey.version}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
 			<build>
 				<plugins>
 					<plugin>
diff --git a/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml b/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
index b2d7e482b848590392d07703b0c7c1e4726e8724..5608c2f189c6b61861c67a04790d099f898b4496 100644
--- a/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
+++ b/src/main/java/org/olat/core/commons/persistence/_spring/databaseCorecontext.xml
@@ -171,10 +171,9 @@
 			<props>
 				<prop key="hibernate.cache.use_query_cache">true</prop>
 				<prop key="hibernate.cache.use_second_level_cache">true</prop>
-				<prop key="hibernate.cache.region.factory_class">org.hibernate.cache.infinispan.JndiInfinispanRegionFactory</prop>
+				<prop key="hibernate.cache.region.factory_class">org.jboss.as.jpa.hibernate4.infinispan.InfinispanRegionFactory</prop>
+				<prop key="hibernate.cache.infinispan.cachemanager">java:jboss/infinispan/container/hibernate</prop>
 				<prop key="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</prop>
-				<prop key="hibernate.cache.infinispan.use_synchronization">false</prop>
-				<prop key="hibernate.cache.infinispan.cachemanager">java:jboss/infinispan/hibernate</prop>
 			</props>
 		</constructor-arg>        
 	</bean>