diff --git a/pom.xml b/pom.xml
index 20701336..189e5e7a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,91 +1,97 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	
+	<modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.couchbase</groupId>
-  <artifactId>spring-data-couchbase</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
-  <packaging>jar</packaging>
+	<groupId>org.springframework.data</groupId>
+	<artifactId>spring-data-couchbase</artifactId>
+	<version>1.0.0.BUILD-SNAPSHOT</version>
 
-  <name>couchbase-spring</name>
-  <url>https://github.com/couchbaselabs/couchbase-spring</url>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+	<name>Spring Data Couchbase</name>
+	<description>Spring Data integration for Couchbase</description>
+	<url>https://github.com/SpringSource/spring-data-couchbase</url>
+	
+	<parent>
+		<groupId>org.springframework.data.build</groupId>
+		<artifactId>spring-data-parent</artifactId>
+		<version>1.1.0.BUILD-SNAPSHOT</version>
+	</parent>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <couchbase>1.1.6</couchbase>
-    <spring>3.2.3.RELEASE</spring>
-  </properties>
+	<properties>
+		<couchbase>1.1.6</couchbase>
+		<jackson>1.9.12</jackson>
+		<springdata.commons>1.6.0.BUILD-SNAPSHOT</springdata.commons>
+	</properties>
 
-  <repositories>
-    <repository>
-      <id>couchbase</id>
-      <name>Couchbase Maven Repository</name>
-      <layout>default</layout>
-      <url>http://files.couchbase.com/maven2/</url>
-    </repository>
-  </repositories>
 
-  <dependencies>
-    <dependency>
-      <groupId>couchbase</groupId>
-      <artifactId>couchbase-client</artifactId>
-      <version>${couchbase}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>${spring}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-web</artifactId>
-        <version>${spring}</version>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
-      <version>2.2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-      <version>${spring}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-commons</artifactId>
-      <version>1.5.1.RELEASE</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.9.12</version>
-    </dependency>
-    <dependency>
-    	<groupId>org.springframework</groupId>
-    	<artifactId>spring-tx</artifactId>
-    	<version>${spring}</version>
-    </dependency>
-  </dependencies>
-  
+	<dependencies>
+	
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<version>${spring}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-web</artifactId>
+			<version>${spring}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+			<version>${spring}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>${groupId}</groupId>
+			<artifactId>spring-data-commons</artifactId>
+			<version>${springdata.commons}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>couchbase</groupId>
+			<artifactId>couchbase-client</artifactId>
+			<version>${couchbase}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>cglib</groupId>
+			<artifactId>cglib</artifactId>
+			<version>2.2.2</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.codehaus.jackson</groupId>
+			<artifactId>jackson-mapper-asl</artifactId>
+			<version>${jackson}</version>
+		</dependency>
+
+	</dependencies>
+
+	<repositories>
+		<repository>
+			<id>couchbase</id>
+			<name>Couchbase Maven Repository</name>
+			<url>http://files.couchbase.com/maven2/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
 </project>
diff --git a/src/main/java/com/couchbase/spring/core/CouchbaseMappingContext.java b/src/main/java/com/couchbase/spring/core/CouchbaseMappingContext.java
index c1740f7e..14931167 100644
--- a/src/main/java/com/couchbase/spring/core/CouchbaseMappingContext.java
+++ b/src/main/java/com/couchbase/spring/core/CouchbaseMappingContext.java
@@ -58,7 +58,6 @@ public class CouchbaseMappingContext
 	public void setApplicationContext(ApplicationContext applicationContext)
     throws BeansException {
 		this.context = applicationContext;
-		super.setApplicationContext(applicationContext);
 	}
 
 }
diff --git a/template.mf b/template.mf
new file mode 100644
index 00000000..b2a51788
--- /dev/null
+++ b/template.mf
@@ -0,0 +1,15 @@
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.springframework.data.couchbase
+Bundle-Name: ${project.name}
+Bundle-Vendor: SpringSource
+Bundle-Version: ${project.version}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Template: 
+ org.springframework.data.couchbase.*;version="${project.version}"
+Import-Template:
+ com.couchbase.client.*;version="${couchbase:[=.=.=,+1.0.0)}",
+ net.spy.memcached.*;version="[2.8.0,3.0.0)",
+ org.codehaus.jackson.*;version="${jackson:[=.=.=,+1.0.0)}",
+ org.springframework.*;version="${spring30:[=.=.=.=,+1.1.0)}",
+ org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}",
+ org.w3c.*;version="0.0.0"
\ No newline at end of file