diff --git a/jpa/java8/src/main/java/example/springdata/jpa/java8/AbstractEntity.java b/jpa/java8/src/main/java/example/springdata/jpa/java8/AbstractEntity.java
index c4091f7f..e2dae9e3 100644
--- a/jpa/java8/src/main/java/example/springdata/jpa/java8/AbstractEntity.java
+++ b/jpa/java8/src/main/java/example/springdata/jpa/java8/AbstractEntity.java
@@ -17,17 +17,20 @@ package example.springdata.jpa.java8;
 
 import java.time.LocalDateTime;
 
+import javax.persistence.EntityListeners;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 /**
  * @author Oliver Gierke
  */
 @MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
 public abstract class AbstractEntity {
 
 	@Id @GeneratedValue Long id;
diff --git a/jpa/java8/src/main/resources/META-INF/orm.xml b/jpa/java8/src/main/resources/META-INF/orm.xml
deleted file mode 100644
index da5ba62b..00000000
--- a/jpa/java8/src/main/resources/META-INF/orm.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_2_0.xsd" version="2.0">
-
-    <persistence-unit-metadata>
-        <persistence-unit-defaults>
-            <entity-listeners>
-                <entity-listener class="org.springframework.data.jpa.domain.support.AuditingEntityListener" />
-            </entity-listeners>
-        </persistence-unit-defaults>
-    </persistence-unit-metadata>
-
-</entity-mappings>