diff --git a/build.properties b/build.properties
index 298b69a86e1..19380fe7ec7 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
-# DON'T forget to update spring-context manifest (Import-Package jpa entry)
 version=3.0.2
 # osgi ranges
-spring.osgi.range="${version:[=.=.=, =.=.+1)}"
+spring.osgi.range.nq=${version:[=.=.=, =.=.+1)}
+spring.osgi.range="${spring.osgi.range.nq}"
 aj.osgi.range="[1.5.4, 2.0.0)"
 
 #
diff --git a/org.springframework.context/template.mf b/org.springframework.context/template.mf
index a4603935866..b6e3be95024 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="[3.0.2,3.0.3)";resolution:=optional,
+ org.springframework.orm.jpa.support;version="${spring.osgi.range.nq}";resolution:=optional,
  com.ibm.websphere.management;version="0";resolution:=optional
 Import-Template: 
  bsh.*;version="[2.0.0.b4, 3.0.0)";resolution:=optional,