diff --git a/pom.xml b/pom.xml
index 7c215d6c6..b1767cea6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,8 +30,7 @@
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
 		<springdata.commons>1.8.0.BUILD-SNAPSHOT</springdata.commons>
-		<mongo>2.11.4</mongo>
-		<mongo-osgi>${mongo}</mongo-osgi>
+		<mongo>2.12.0</mongo>
 	</properties>
 	
 	<developers>
@@ -108,7 +107,6 @@
 			<id>mongo-next</id>
 			<properties>
 				<mongo>2.12.0</mongo>
-				<mongo-osgi>2.12.0</mongo-osgi>
 			</properties>
 		</profile>
 	</profiles>
diff --git a/spring-data-mongodb-cross-store/template.mf b/spring-data-mongodb-cross-store/template.mf
index 8c38801c1..046a11a09 100644
--- a/spring-data-mongodb-cross-store/template.mf
+++ b/spring-data-mongodb-cross-store/template.mf
@@ -2,12 +2,12 @@ Bundle-SymbolicName: org.springframework.data.mongodb.crossstore
 Bundle-Name: Spring Data MongoDB Cross Store Support
 Bundle-Vendor: Pivotal Software, Inc.
 Bundle-ManifestVersion: 2
-Import-Package: 
+Import-Package:
  sun.reflect;version="0";resolution:=optional
 Export-Template:
  org.springframework.data.mongodb.crossstore.*;version="${project.version}"
-Import-Template: 
- com.mongodb.*;version="${mongo-osgi:[=.=.=,+1.0.0)}",
+Import-Template:
+ com.mongodb.*;version="${mongo:[=.=.=,+1.0.0)}",
  javax.persistence.*;version="${jpa:[=.=.=,+1.0.0)}",
  org.aspectj.*;version="${aspectj:[1.0.0, 2.0.0)}",
  org.bson.*;version="0",
diff --git a/spring-data-mongodb-log4j/template.mf b/spring-data-mongodb-log4j/template.mf
index 606d49db0..cca0bedf7 100644
--- a/spring-data-mongodb-log4j/template.mf
+++ b/spring-data-mongodb-log4j/template.mf
@@ -5,5 +5,5 @@ Bundle-ManifestVersion: 2
 Import-Package:
  sun.reflect;version="0";resolution:=optional
 Import-Template:
- com.mongodb.*;version="${mongo-osgi:[=.=.=,+1.0.0)}",
+ com.mongodb.*;version="${mongo:[=.=.=,+1.0.0)}",
  org.apache.log4j.*;version="${log4j:[=.=.=,+1.0.0)}"
diff --git a/spring-data-mongodb/template.mf b/spring-data-mongodb/template.mf
index 581928954..2fcf7671d 100644
--- a/spring-data-mongodb/template.mf
+++ b/spring-data-mongodb/template.mf
@@ -2,13 +2,13 @@ Bundle-SymbolicName: org.springframework.data.mongodb
 Bundle-Name: Spring Data MongoDB Support
 Bundle-Vendor: Pivotal Software, Inc.
 Bundle-ManifestVersion: 2
-Import-Package: 
+Import-Package:
  sun.reflect;version="0";resolution:=optional
 Export-Template:
  org.springframework.data.mongodb.*;version="${project.version}"
-Import-Template: 
+Import-Template:
  com.google.common.base.*;version="[11.0.0,14.0.0)";resolution:=optional,
- com.mongodb.*;version="${mongo-osgi:[=.=.=,+1.0.0)}",
+ com.mongodb.*;version="${mongo:[=.=.=,+1.0.0)}",
  com.mysema.query.*;version="[2.1.1, 3.0.0)";resolution:=optional,
  javax.annotation.processing.*;version="0",
  javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional,