diff --git a/core/template.mf b/core/template.mf
new file mode 100644
index 0000000..b05008b
--- /dev/null
+++ b/core/template.mf
@@ -0,0 +1,10 @@
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: ${project.artifactId}
+Bundle-Name: ${project.name}
+Bundle-Vendor: Synyx GmbH & Co. KG
+Bundle-Version: ${project.version}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Template: 
+ ${project.artifactId}.*;version="${project.version}"
+Import-Template: 
+ org.springframework.*;version="${spring.version:[=.=.=.=,+2.0.0)}"
diff --git a/metadata/template.mf b/metadata/template.mf
new file mode 100644
index 0000000..56aae70
--- /dev/null
+++ b/metadata/template.mf
@@ -0,0 +1,19 @@
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: ${project.artifactId}
+Bundle-Name: ${project.name}
+Bundle-Vendor: Synyx GmbH & Co. KG
+Bundle-Version: ${project.version}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Template: 
+ org.synyx.hades.*;version="${project.version}"
+Import-Template: 
+ javax.persistence.*;version="[1.0.0,1.1.0)", 
+ org.aopalliance.*;version="[1.0.0,2.0.0)", 
+ org.apache.commons.logging.*;version="[1.1.0,1.2.0)",
+ org.aspectj.lang.*;version="[1.6.0,1.7.0)",
+ org.eclipse.persistence.*;version="[1.0.0,1.2.0)";resolution:=optional,
+ org.hibernate.*;version="[3.2.0,3.4.0)";resolution:=optional,
+ org.apache.openjpa.*;version="[1.2.1,2.0.0)";resolution:=optional, 
+ org.joda.time.*;version="[1.5.0,2.0.0)",
+ org.springframework.*;version="[2.5.0,4.0.0)",
+ org.w3c.dom.*;version="0.0.0"
diff --git a/pom.xml b/pom.xml
index 1c7bfc7..764db93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,36 +148,26 @@
             </plugin>
 
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>1.4.3</version>
-
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>*</Export-Package>
-                        <Bundle-SymbolicName>${project.groupId}</Bundle-SymbolicName>
-                        <Include-Resource>src/main/resources</Include-Resource>
-                    </instructions>
-                </configuration>
-            </plugin>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+				<version>1.0.0.RELEASE</version>
+				<executions>
+					<execution>
+						<id>bundlor</id>
+						<goals>
+							<goal>bundlor</goal>
+						</goals>
+						<phase>process-classes</phase>
+					</execution>
+				</executions>
+     		</plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>2.2</version>
                 <configuration>
-                    <archive>
-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
+                    <useDefaultManifestFile>true</useDefaultManifestFile>
                 </configuration>
             </plugin>
 
@@ -311,7 +301,6 @@
     </distributionManagement>
 
     <repositories>
-
         <repository>
             <id>com.springsource.repository.bundles.release</id>
             <name>SpringSource Enterprise Bundle Repository - Release Bundles</name>
@@ -320,7 +309,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-
         <repository>
             <id>com.springsource.repository.bundles.external</id>
             <name>SpringSource Enterprise Bundle Repository - External Bundles</name>
@@ -329,7 +317,14 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-
     </repositories>
+    
+    <pluginRepositories>
+        <pluginRepository>
+            <id>com.springsource.repository.bundles.release</id>
+            <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Release Bundles</name>
+            <url>http://repository.springsource.com/maven/bundles/release</url>
+        </pluginRepository>
+    </pluginRepositories>
 
 </project>