diff --git a/spring-data-neo4j-aspects/template.mf b/spring-data-neo4j-aspects/template.mf
index 995a1b875..e59eed60e 100644
--- a/spring-data-neo4j-aspects/template.mf
+++ b/spring-data-neo4j-aspects/template.mf
@@ -2,8 +2,6 @@ Bundle-SymbolicName: org.springframework.data.neo4j.aspects
 Bundle-Name: Spring Data Neo4j Aspects
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package: 
- sun.reflect;version="0";resolution:=optional
 Import-Template: 
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
  org.springframework.context.*;version="[3.0.0, 4.0.0)",
@@ -33,6 +31,7 @@ Import-Template:
  javax.persistence.spi.*;version="[1.0.0, 3.0.0)";resolution:=optional,
  javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional
 Import-Package: 
+ sun.reflect;version="0";resolution:=optional,
  net.sf.cglib.proxy;version="[2.2.0,3.0.0)",
  net.sf.cglib.core;version="[2.2.0,3.0.0)",
  net.sf.cglib.reflect;version="[2.2.0,3.0.0)"
diff --git a/spring-data-neo4j-cross-store/template.mf b/spring-data-neo4j-cross-store/template.mf
index fdf8f59cc..a79297735 100644
--- a/spring-data-neo4j-cross-store/template.mf
+++ b/spring-data-neo4j-cross-store/template.mf
@@ -2,8 +2,6 @@ Bundle-SymbolicName: org.springframework.data.neo4j.cross_store
 Bundle-Name: Spring Data Neo4J Cross-Store
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package: 
- sun.reflect;version="0";resolution:=optional
 Import-Template: 
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
  org.springframework.context.*;version="[3.0.0, 4.0.0)",
@@ -36,6 +34,7 @@ Import-Template:
  com.tinkerpop.gremlin.*;version="[1.1,2.0)";resolution:=optional,
  com.tinkerpop.pipes.util.*;version="[0.8,1.0)";resolution:=optional
 Import-Package: 
+ sun.reflect;version="0";resolution:=optional 
  net.sf.cglib.proxy;version="[2.2.0,3.0.0)",
  net.sf.cglib.core;version="[2.2.0,3.0.0)",
  net.sf.cglib.reflect;version="[2.2.0,3.0.0)"
diff --git a/spring-data-neo4j-rest/template.mf b/spring-data-neo4j-rest/template.mf
index 1a5d38574..4b0d196ea 100644
--- a/spring-data-neo4j-rest/template.mf
+++ b/spring-data-neo4j-rest/template.mf
@@ -18,5 +18,5 @@ Import-Template:
  com.sun.jersey.api.*;version="0",
  javax.ws.rs.core.*;version="0",
  org.codehaus.jackson.*;version="0"
-Excluded-Exports:
+Excluded-Exports: 
  org.neo4j.kernel
\ No newline at end of file
diff --git a/spring-data-neo4j/template.mf b/spring-data-neo4j/template.mf
index f81ba106f..96b87788c 100644
--- a/spring-data-neo4j/template.mf
+++ b/spring-data-neo4j/template.mf
@@ -2,8 +2,6 @@ Bundle-SymbolicName: org.springframework.data.neo4j
 Bundle-Name: Spring Data Neo4J
 Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
-Import-Package: 
- sun.reflect;version="0";resolution:=optional
 Import-Template: 
  org.springframework.beans.*;version="[3.0.0, 4.0.0)",
  org.springframework.context.*;version="[3.0.0, 4.0.0)",
@@ -36,6 +34,7 @@ Import-Template:
  com.tinkerpop.gremlin.*;version="[1.1,2.0)";resolution:=optional,
  com.tinkerpop.pipes.util.*;version="[0.8,1.0)";resolution:=optional
 Import-Package: 
+ sun.reflect;version="0";resolution:=optional, 
  net.sf.cglib.proxy;version="[2.2.0,3.0.0)",
  net.sf.cglib.core;version="[2.2.0,3.0.0)",
  net.sf.cglib.reflect;version="[2.2.0,3.0.0)"