diff --git a/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java b/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java
index fe53ca01f..b4461b3c6 100644
--- a/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java
+++ b/src/main/java/org/springframework/data/jpa/repository/config/JpaAuditingRegistrar.java
@@ -101,7 +101,8 @@ class JpaAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
 		}
 
 		if (!ClassUtils.isPresent(BEAN_CONFIGURER_ASPECT_CLASS_NAME, getClass().getClassLoader())) {
-			throw new BeanDefinitionStoreException("Could not configure Spring Data JPA auditing-feature because"
+			throw new BeanDefinitionStoreException(BEAN_CONFIGURER_ASPECT_CLASS_NAME + " not found. \n"
+					+ "Could not configure Spring Data JPA auditing-feature because"
 					+ " spring-aspects.jar is not on the classpath!\n"
 					+ "If you want to use auditing please add spring-aspects.jar to the classpath.");
 		}
diff --git a/template.mf b/template.mf
index 3d5133124..13f9dcf8c 100644
--- a/template.mf
+++ b/template.mf
@@ -22,4 +22,7 @@ Import-Template:
  org.springframework.beans.factory.aspectj;version="${spring:[=.=.=.=,+1.1.0)}";resolution:=optional,
  org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
  org.w3c.*;version="0.0.0"
- 
\ No newline at end of file
+Import-Package: org.aspectj.lang;version="${aspectj:[=.=.=,+1.0.0)}";resolution:=optional,
+ org.aspectj.runtime.reflect;version="${aspectj:[=.=.=,+1.0.0)}";resolution:=optional,
+ org.springframework.beans.factory.aspectj;version="${spring:[=.=.=.=,+1.1.0)}";resolution:=optional
+