Index: modeshape-graph/pom.xml
===================================================================
--- modeshape-graph/pom.xml	(revision 2164)
+++ modeshape-graph/pom.xml	(working copy)
@@ -96,6 +96,22 @@
 					</execution>
 				</executions>
 			</plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/with-dependencies.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin>
 		</plugins>
 	</build>
 </project>
Index: modeshape-graph/src/main/assembly/with-dependencies.xml
new file mode 100644
===================================================================
--- /dev/null	(revision 2164)
+++ modeshape-graph/src/main/assembly/with-dependencies.xml	(working copy)
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<assembly>
+	<id>jar-with-dependencies</id>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>jar</format>
+	</formats>
+	<dependencySets>
+		<dependencySet>
+			<unpack>true</unpack>
+			<scope>runtime</scope>
+		</dependencySet>
+	</dependencySets>
+	<!--fileSets>
+    <fileSet>
+      <directory>${project.build.outputDirectory}</directory>
+      <includes>
+				<include>${project.artifactId}-${project.version}.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets-->
+</assembly>
Index: modeshape-jcr/src/main/assembly/with-dependencies.xml
===================================================================
--- modeshape-jcr/src/main/assembly/with-dependencies.xml	(revision 2164)
+++ modeshape-jcr/src/main/assembly/with-dependencies.xml	(working copy)
@@ -1,12 +1,12 @@
 <assembly>
-  <id>with-dependencies</id>
+  <id>jar-with-dependencies</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <formats>
     <format>jar</format>
   </formats>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
+      <unpack>true</unpack>
       <scope>runtime</scope>
 			<excludes>
 				<!-- Cannot ship the JCR 1.0 jar -->
Index: src/main/assembly/classloader-with-dependencies.xml
===================================================================
--- src/main/assembly/classloader-with-dependencies.xml	(revision 2164)
+++ src/main/assembly/classloader-with-dependencies.xml	(working copy)
@@ -1,12 +1,12 @@
 <assembly>
-  <id>with-dependencies</id>
+  <id>jar-with-dependencies</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <formats>
     <format>jar</format>
   </formats>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
+      <unpack>true</unpack>
       <scope>runtime</scope>
 			<excludes>
 				<!-- No need to include the JCIP annotations -->
Index: src/main/assembly/connector-with-dependencies.xml
===================================================================
--- src/main/assembly/connector-with-dependencies.xml	(revision 2164)
+++ src/main/assembly/connector-with-dependencies.xml	(working copy)
@@ -1,12 +1,12 @@
 <assembly>
-  <id>with-dependencies</id>
+  <id>jar-with-dependencies</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <formats>
     <format>jar</format>
   </formats>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
+      <unpack>true</unpack>
       <scope>runtime</scope>
 			<outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
 			<excludes>
Index: src/main/assembly/mimetype-detector-with-dependencies.xml
===================================================================
--- src/main/assembly/mimetype-detector-with-dependencies.xml	(revision 2164)
+++ src/main/assembly/mimetype-detector-with-dependencies.xml	(working copy)
@@ -1,12 +1,12 @@
 <assembly>
-  <id>with-dependencies</id>
+  <id>jar-with-dependencies</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <formats>
     <format>jar</format>
   </formats>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
+      <unpack>true</unpack>
       <scope>runtime</scope>
 			<outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
 			<excludes>
Index: src/main/assembly/sequencer-with-dependencies.xml
===================================================================
--- src/main/assembly/sequencer-with-dependencies.xml	(revision 2164)
+++ src/main/assembly/sequencer-with-dependencies.xml	(working copy)
@@ -1,12 +1,12 @@
 <assembly>
-  <id>with-dependencies</id>
+  <id>jar-with-dependencies</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <formats>
     <format>jar</format>
   </formats>
   <dependencySets>
     <dependencySet>
-      <unpack>false</unpack>
+      <unpack>true</unpack>
       <scope>runtime</scope>
 			<outputFileNameMapping>${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
 			<excludes>