diff --git a/bundles-pom/pom.xml b/bundles-pom/pom.xml
index a034ac2..dd3721d 100644
--- a/bundles-pom/pom.xml
+++ b/bundles-pom/pom.xml
@@ -94,7 +94,7 @@
                     <instructions>
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Description>${project.description}</Bundle-Description>
-                        <Export-Package>${servicemix.osgi.export.pkg}</Export-Package>
+                        <Export-Package>${servicemix.osgi.export.pkg}*;version=${pkgVersion};-split-package:=merge-first</Export-Package>
                         <Import-Package>${servicemix.osgi.import.pkg}</Import-Package>
                         <Private-Package>${servicemix.osgi.private.pkg}</Private-Package>
                         <DynamicImport-Package>${servicemix.osgi.dynamicimport.pkg}</DynamicImport-Package>
diff --git a/hibernate-3.6.0/pom.xml b/hibernate-3.6.0/pom.xml
index 2d2b7dd..01696f3 100644
--- a/hibernate-3.6.0/pom.xml
+++ b/hibernate-3.6.0/pom.xml
@@ -34,12 +34,12 @@
             javasssist*;version="[3.12.0]",            
             javax.naming*,
             javax.persistence*;version="[2,2.1)",
-            javax.security.auth*,
-            javax.security.jacc*,
+            javax.security.auth*;resolution:=optional,
+            javax.security.jacc*;resolution:=optional,
             java.sql*,
             javax.transaction*;resolution:=optional;version="[1.1,2)",
             javax.xml*,            
-            javax.validation*;version="[1.0,1.1)",            
+            javax.validation*;resolution:=optional;version="[1.0,1.1)",            
             net.sf.cglib*;version="[2.1,3]",
             org.slf4j*;version="[1.4,2.0)",
             org.dom4j*;version="[1.6.0,2)",
diff --git a/hibernate-3.6.9.Final/pom.xml b/hibernate-3.6.9.Final/pom.xml
new file mode 100644
index 0000000..e45d9e8
--- /dev/null
+++ b/hibernate-3.6.9.Final/pom.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+        
+    <parent>        
+        <groupId>com.googlecode.servicemix.extra</groupId>
+        <artifactId>bundles-pom</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../bundles-pom/pom.xml</relativePath>
+    </parent>
+        
+    <groupId>com.googlecode.servicemix.extra.bundles</groupId>    
+    <artifactId>com.googlecode.servicemix.extra.bundles.hibernate</artifactId>    
+    <version>3.6.9.Final_1-SNAPSHOT</version>    
+    <packaging>bundle</packaging>    
+    <name>Apache ServiceMix Extra :: Bundles :: ${pkgArtifactId}</name>
+    
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.    
+    </description>    
+    
+    <properties>        
+        <commons.annotations.version>3.2.0.Final</commons.annotations.version>        
+        <pkgGroupId>org.hibernate</pkgGroupId>        
+        <pkgArtifactId>hibernate</pkgArtifactId>        
+        <pkgVersion>3.6.9.Final</pkgVersion>        
+        <servicemix.osgi.export.pkg>
+            org.hibernate*        
+        </servicemix.osgi.export.pkg>        
+        <servicemix.osgi.import.pkg>            
+            antlr*;version="[2.5,3)",            
+            com.ibm*;resolution:=optional,                        
+            javasssist*;version="[3.12.0]",            
+            javax.naming*,
+            javax.persistence*;version="[2,2.1)",
+            javax.security.auth*;resolution:=optional,
+            javax.security.jacc*;resolution:=optional,
+            java.sql*,
+            javax.transaction*;resolution:=optional;version="[1.1,2)",
+            javax.xml*,            
+            javax.validation*;resolution:=optional;version="[1.0,1.1)",            
+            net.sf.cglib*;version="[2.1,3]",
+            org.slf4j*;version="[1.4,2.0)",
+            org.dom4j*;version="[1.6.0,2)",
+            org.apache.commons.collections*;version="[3.2,4)",
+            org.apache.tools.ant*;version="[1.7,2)",                        
+            org.w3c.dom*,
+            org.xml.sax*,
+            *            
+        </servicemix.osgi.import.pkg>        
+        <servicemix.osgi.private.pkg/>    
+    </properties>
+    
+    
+    <dependencies>        
+        <dependency>            
+            <groupId>${pkgGroupId}</groupId>            
+            <artifactId>${pkgArtifactId}-core</artifactId>            
+            <version>${pkgVersion}</version>            
+            <scope>provided</scope>                    
+        </dependency>        
+        
+        <dependency>            
+            <groupId>${pkgGroupId}</groupId>            
+            <artifactId>${pkgArtifactId}-entitymanager</artifactId>            
+            <version>${pkgVersion}</version>            
+            <scope>provided</scope>                    
+        </dependency>                            
+    </dependencies>
+    
+    
+    <repositories>        
+        <repository>            
+            <id>jboss</id>            
+            <name>JBoss Maven Repository</name>            
+            <url>http://repository.jboss.org/nexus/content/groups/public-jboss/</url>            
+            <releases>                
+                <enabled>true</enabled>            
+            </releases>            
+            <snapshots>                
+                <enabled>false</enabled>            
+            </snapshots>        
+        </repository>    
+    </repositories>    
+    
+    <build>        
+        <plugins>            
+            <plugin>                
+                <groupId>org.apache.maven.plugins</groupId>                
+                <artifactId>maven-shade-plugin</artifactId>                
+                <executions>                    
+                    <execution>                        
+                        <phase>package</phase>                        
+                        <goals>                            
+                            <goal>shade</goal>                        
+                        </goals>                        
+                        <configuration>                            
+                            <artifactSet>                                
+                                <includes>                                    
+                                    <include>${pkgGroupId}:${pkgArtifactId}-core</include>                                    
+                                    <include>${pkgGroupId}:${pkgArtifactId}-entitymanager</include>                                
+                                </includes>                            
+                            </artifactSet>                            
+                            <filters>                                
+                                <filter>                                    
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}-core</artifact>                                    
+                                    <excludes>                                        
+                                        <exclude>**</exclude>                                    
+                                    </excludes>                                
+                                </filter>                                
+                                <filter>                                    
+                                    <artifact>${pkgGroupId}:${pkgArtifactId}-entitymanager</artifact>                                    
+                                    <excludes>                                        
+                                        <exclude>**</exclude>                                    
+                                    </excludes>                                
+                                </filter>                            
+                            </filters>                            
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>                            
+                            <createDependencyReducedPom>true</createDependencyReducedPom>                        
+                        </configuration>                    
+                    </execution>                
+                </executions>            
+            </plugin>        
+        </plugins>   
+    </build>
+</project>
diff --git a/hibernate-3.6.9.Final/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/hibernate-3.6.9.Final/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 0000000..1d42767
--- /dev/null
+++ b/hibernate-3.6.9.Final/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+    <bean id="persistenceProviderImpl" class="org.hibernate.ejb.HibernatePersistence"/>                                                                                
+    <service id="persistenceProvider" ref="persistenceProviderImpl"  interface="javax.persistence.spi.PersistenceProvider">
+        <service-properties>
+            <entry key="javax.persistence.provider" value="org.hibernate.ejb.HibernatePersistence">
+            </entry>
+        </service-properties>
+    </service>
+</blueprint>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5f75031..f0fc476 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,7 @@
     <modules>
         <module>bundles-pom</module>
         <module>hibernate-3.6.0</module>
+        <module>hibernate-3.6.9.Final</module>
     </modules>
 
 </project>