diff --git a/pom.xml b/pom.xml
index fa16d70..535198c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,6 +13,11 @@
 	</organization>
   <inceptionYear>2008</inceptionYear>
   
+  <modules>
+  	<module>hera-core</module>
+  	<module>hera-metadata</module>
+  </modules>
+  
   <developers>
 		<developer>
 			<id>gierke_cvs</id>
@@ -61,6 +66,7 @@
 						<goals>
 							<goal>jar</goal>
 						</goals>
+						<phase>deploy</phase>
 					</execution>
 				</executions>
 			</plugin>
@@ -179,13 +185,43 @@
 
 				</configuration>
 			</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>
+			
+			<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>
+				</configuration>
+			</plugin>
 
 		</plugins>
 	</build>
-	<modules>
-		<module>hera-core</module>
-		<module>hera-metadata</module>
-	</modules>
 
 	<reporting>
 		<plugins>