diff --git a/spring-data-mongodb-cross-store/pom.xml b/spring-data-mongodb-cross-store/pom.xml
index 0e23f3672..88aecb8ca 100644
--- a/spring-data-mongodb-cross-store/pom.xml
+++ b/spring-data-mongodb-cross-store/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aspects</artifactId>
-      <version>${org.springframework.version}</version>
+      <version>${org.springframework.version.range}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/spring-data-mongodb-parent/pom.xml b/spring-data-mongodb-parent/pom.xml
index 2c48da076..75fdca4fe 100644
--- a/spring-data-mongodb-parent/pom.xml
+++ b/spring-data-mongodb-parent/pom.xml
@@ -16,7 +16,9 @@
     <org.mockito.version>1.8.4</org.mockito.version>
     <org.slf4j.version>1.5.10</org.slf4j.version>
     <org.codehaus.jackson.version>1.6.1</org.codehaus.jackson.version>
-    <org.springframework.version>3.0.6.RELEASE</org.springframework.version>
+    <org.springframework.version.30>3.0.6.RELEASE</org.springframework.version.30>
+    <org.springframework.version.40>4.0.0.RELEASE</org.springframework.version.40>
+    <org.springframework.version.range>[${org.springframework.version.30}, ${org.springframework.version.40})</org.springframework.version.range>
     <data.commons.version>1.2.0.BUILD-SNAPSHOT</data.commons.version>
     <aspectj.version>1.6.11.RELEASE</aspectj.version>
   </properties>
@@ -92,42 +94,42 @@
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-aop</artifactId>
-        <version>${org.springframework.version}</version>
+        <version>${org.springframework.version.range}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-beans</artifactId>
-        <version>${org.springframework.version}</version>
+        <version>${org.springframework.version.range}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-core</artifactId>
-        <version>${org.springframework.version}</version>
+        <version>${org.springframework.version.range}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-tx</artifactId>
-        <version>${org.springframework.version}</version>
+        <version>${org.springframework.version.range}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-orm</artifactId>
-        <version>${org.springframework.version}</version>
+        <version>${org.springframework.version.range}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
-        <version>${org.springframework.version}</version>
+        <version>${org.springframework.version.range}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-expression</artifactId>
-        <version>${org.springframework.version}</version>
+        <version>${org.springframework.version.range}</version>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-test</artifactId>
-        <version>${org.springframework.version}</version>
+        <version>${org.springframework.version.range}</version>
         <scope>test</scope>
       </dependency>
 
diff --git a/spring-data-mongodb/template.mf b/spring-data-mongodb/template.mf
index ce0283357..7b662730d 100644
--- a/spring-data-mongodb/template.mf
+++ b/spring-data-mongodb/template.mf
@@ -7,7 +7,7 @@ Import-Package:
 Export-Template:
  org.springframework.data.mongodb.*;version="${project.version}"
 Import-Template: 
- org.springframework.*;version="${org.springframework.version:[=.=.=.=,+1.0.0)}",
+ org.springframework.*;version="${org.springframework.version.30:[=.=.=.=,+1.0.0)}",
  org.springframework.data.*;version="${data.commons.version:[=.=.=.=,+1.0.0)}",
  org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}",
  com.mongodb.*;version="${mongo.version:[=.=,+1.0.0)}",