diff --git a/build.gradle b/build.gradle
index 233e547f..6146b0e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,7 @@ apply plugin: 'idea'
 apply from: "$rootDir/maven.gradle"
 apply plugin: 'docbook-reference'
 apply plugin: 'org.asciidoctor.gradle.asciidoctor'
-//apply plugin: 'bundlor'
+apply plugin: 'bundlor'
 
 //project.bundlor.bundleSymbolicName = "${bundleSymbolicName}"
 
@@ -137,6 +137,9 @@ javadoc {
 }
 
 jar {
+
+    dependsOn = [ 'bundlor' ]
+
     manifest.attributes['Implementation-Title'] = 'spring-data-gemfire'
     manifest.attributes['Implementation-Version'] = project.version
 
@@ -148,6 +151,10 @@ jar {
     }
 }
 
+bundlor {
+    manifestTemplate = file("template.mf").text
+}
+
 // Reference documentation
 
 reference {
diff --git a/gradle.properties b/gradle.properties
index 0e9e706f..999d1e15 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,5 @@
 antlrVersion=2.7.7
-aspectjVersion=1.7.4
-bundleSymbolicName=org.springframework.data.gemfire
-gemfire.range="[6.5, 9.0)"
+aspectjVersion=1.8.2
 gemfireVersion=8.0.0
 hamcrestVersion=1.3
 jacksonVersion=2.4.1
diff --git a/template.mf b/template.mf
index 07224dde..a4ebbfc3 100644
--- a/template.mf
+++ b/template.mf
@@ -1,21 +1,15 @@
 Bundle-SymbolicName: org.springframework.data.gemfire
 Bundle-Name: Spring Data GemFire
-Bundle-Vendor: SpringSource
+Bundle-Vendor: Pivotal Software, Inc.
 Bundle-ManifestVersion: 2
-Import-Package: 
+Import-Package:
  sun.reflect;version="0";resolution:=optional
-Import-Template: 
- org.springframework.asm.*;version="[3.0.0, 4.0.0)",
- org.springframework.beans.*;version="[3.0.0, 4.0.0)",
- org.springframework.cache.*;version="[3.0.0, 4.0.0)",
- org.springframework.context.*;version="[3.0.0, 4.0.0)",
- org.springframework.core.*;version="[3.0.0, 4.0.0)",
- org.springframework.dao.*;version="[3.0.0, 4.0.0)",
- org.springframework.data.*;version="[1.2.0,2.0.0)",
- org.springframework.expression.*;version="[3.0.0, 4.0.0)",
- org.springframework.util.*;version="[3.0.0, 4.0.0)",
- org.springframework.transaction.*;version="[3.0.0, 4.0.0)",
- com.gemstone.*;version="[6.5, 8.0)",
+Import-Template:
+ com.fasterxml.jackson.*;version="[2.4.1,3.0.0)";resolution:=optional,
+ com.gemstone.*;version="[8.0.0,9.0.0)",
  org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional,
  org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
- org.w3c.dom.*;version="0"
\ No newline at end of file
+ org.aspectj.*;version="[1.8.2, 2.0.0)";resolution:=optional,
+ org.springframework.*;version="[4.0.6, 5.0.0)",
+ org.springframework.data.*;version="[1.9.0,2.0.0)",
+ org.w3c.dom.*;version="0"