diff --git a/pom.xml b/pom.xml
index 8862a0b1..b637eb30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	
 	<groupId>org.springframework.hateoas</groupId>
 	<artifactId>spring-hateoas</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
+	<version>0.1.0.BUILD-SNAPSHOT</version>
 	
 	<name>Spring Hateoas</name>
 	<description>
@@ -57,6 +57,7 @@
 
 	<properties>
 		<spring.version>3.1.1.RELEASE</spring.version>
+		<bundlor.failOnWarnings>true</bundlor.failOnWarnings>
 	</properties>
 
 	<dependencies>
@@ -119,6 +120,40 @@
 					<target>1.6</target>
 				</configuration>
 			</plugin>
+			
+			<plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+				<version>1.0.0.RELEASE</version>
+				<configuration>
+					<failOnWarnings>${bundlor.failOnWarnings}</failOnWarnings>
+				</configuration>
+				<executions>
+					<execution>
+						<id>bundlor</id>
+						<goals>
+							<goal>bundlor</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.3.1</version>
+				<configuration>
+					<useDefaultManifestFile>true</useDefaultManifestFile>
+				</configuration>
+			</plugin>
+			
 		</plugins>
 	</build>
+	
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-plugins-release</id>
+			<url>http://repo.springsource.org/plugins-release</url>
+		</pluginRepository>
+	</pluginRepositories>
 </project>
\ No newline at end of file
diff --git a/template.mf b/template.mf
new file mode 100644
index 00000000..b9e5e557
--- /dev/null
+++ b/template.mf
@@ -0,0 +1,7 @@
+Bundle-SymbolicName: org.springframework.hateoas
+Bundle-Name: Spring HATEOAS
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Import-Template:
+ javax.xml.bind.*;version="0",
+ org.springframework.*;version="${spring.version:[=.=.=,+1.0.0)}";resolution:=optional