diff --git a/distribution/pom.xml b/distribution/pom.xml
index e81b7cb222..c90dbb84ac 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -107,6 +107,21 @@
             <artifactId>hibernate-proxool</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>hibernate-annotations</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>hibernate-entitymanager</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
         <!-- optional deps for bytecode providers since they are optional on core -->
         <dependency>
diff --git a/distribution/src/assembly/dist.xml b/distribution/src/assembly/dist.xml
index 4947b2be7a..a4aa439fd9 100644
--- a/distribution/src/assembly/dist.xml
+++ b/distribution/src/assembly/dist.xml
@@ -24,9 +24,9 @@
   ~ Boston, MA  02110-1301  USA
   -->
 
-<assembly xmlns="http://maven.apache.org/POM/4.0.0"
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.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/assembly-1.1.0-SNAPSHOT.xsd">
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
 
     <!--
         Produces a dist-style bundle similar to what previous (non-mavenized) versions of
@@ -105,18 +105,6 @@
 
         <dependencySet>
             <outputDirectory>lib/optional/jbosscache</outputDirectory>
-            <includes>
-                <include>jboss:jboss-cache</include>
-                <include>concurrent:concurrent:1.3.4</include>
-                <include>jboss:jboss-common:4.0.2</include>
-                <include>jboss:jboss-jmx:4.0.2</include>
-                <include>jboss:jboss-system:4.0.2</include>
-                <include>jgroups:jgroups-all:2.2.7</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <outputDirectory>lib/optional/jbosscache2</outputDirectory>
             <includes>
                 <include>org.jboss.cache:jbosscache-core</include>
             </includes>
diff --git a/distribution/src/assembly/hibernate-all.xml b/distribution/src/assembly/hibernate-all.xml
index 51a16328ed..2f4743e6e0 100644
--- a/distribution/src/assembly/hibernate-all.xml
+++ b/distribution/src/assembly/hibernate-all.xml
@@ -25,9 +25,9 @@
   ~
   -->
 
-<assembly xmlns="http://maven.apache.org/POM/4.0.0"
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.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/assembly-1.1.0-SNAPSHOT.xsd">
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
 
     <!--
         Take the 'core' resoures and build a jar, ala the legacy hibernate3.jar
@@ -46,6 +46,10 @@
             <includes>
                 <include>org.hibernate:*</include>
             </includes>
+            <excludes>
+                <exclude>org.hibernate:hibernate-tools:*</exclude>
+                <exclude>org.hibernate:jtidy:*</exclude>
+            </excludes>
         </dependencySet>
     </dependencySets>