diff --git a/build.gradle b/build.gradle
index cae83ec5f8..aa1943c702 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,6 +4,7 @@ buildscript {
     }
     dependencies {
         classpath 'org.springframework.build.gradle:docbook-reference-plugin:0.1.2-SNAPSHOT'
+        classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.2-SNAPSHOT'
     }
 }
 
@@ -24,7 +25,10 @@ configure(allprojects) {
     test.systemProperty("java.awt.headless", "true")
 
     repositories {
-        maven { url "http://repo.springsource.org/libs-release" }
+        maven {
+            url "http://repo.springsource.org/libs-release"
+            url "http://repo.springsource.org/plugins-release"
+        }
     }
 
     dependencies {
@@ -77,6 +81,16 @@ configure(subprojects) {
     }
 }
 
+configure(subprojects - project(":spring-aspects")) {
+    apply plugin: 'bundlor'
+    bundlor {
+        manifestTemplate = new File("${projectDir}/template.mf").text
+            .replace('${spring.osgi.range}', /"[$version, $version]"/)
+            .replace('${aj.osgi.range}', '"[1.6.8, 2.0.0)"')
+    }
+}
+
+
 
 project("spring-asm") {
     description = 'Spring ASM'
diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf
index 12f4bbb0e1..19cae29fd6 100644
--- a/org.springframework.context/template.mf
+++ b/org.springframework.context/template.mf
@@ -4,7 +4,7 @@ Bundle-Vendor: SpringSource
 Bundle-ManifestVersion: 2
 Import-Package: 
  javax.persistence;version="[1.0.0, 3.0.0)";resolution:=optional,
- org.springframework.orm.jpa.support;version="${spring.osgi.range.nq}";resolution:=optional,
+ org.springframework.orm.jpa.support;version=${spring.osgi.range};resolution:=optional,
  com.ibm.websphere.management;version="0";resolution:=optional
 Import-Template: 
  bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional,