diff --git a/querydsl-jdo/pom.xml b/querydsl-jdo/pom.xml
index e92c28561..cdc3e14d2 100644
--- a/querydsl-jdo/pom.xml
+++ b/querydsl-jdo/pom.xml
@@ -152,7 +152,27 @@
             </goals>
           </execution>
         </executions>
-      </plugin> 
+      </plugin> 
+	  
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+		<executions>
+		  <execution>
+		  	<id>apt-one-jar</id>
+			<goals>
+			  <goal>single</goal>	
+			</goals>
+			<phase>package</phase>
+		  	<configuration>
+              <descriptors>
+                <descriptor>src/main/assembly.xml</descriptor>
+              </descriptors>
+			  <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+		  </execution>	
+		</executions>         
+      </plugin>	  	  
+	  
       <plugin>
         <groupId>com.mysema.maven</groupId>
         <artifactId>maven-apt-plugin</artifactId>
@@ -167,7 +187,8 @@
             </configuration>
           </execution>
         </executions>    
-      </plugin>   
+      </plugin>   
+	  
       <plugin>
         <groupId>com.mysema.querydsl</groupId>
         <artifactId>querydsl-maven-plugin</artifactId>
diff --git a/querydsl-jdo/src/main/assembly.xml b/querydsl-jdo/src/main/assembly.xml
new file mode 100644
index 000000000..73c5254cd
--- /dev/null
+++ b/querydsl-jdo/src/main/assembly.xml
@@ -0,0 +1,32 @@
+<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/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>apt-one-jar</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>src/apt</directory>	
+	  <outputDirectory>/</outputDirectory>
+	  <includes>
+	    <include>**/*</include>	
+	  </includes>	
+	</fileSet>	
+  </fileSets>	
+  <dependencySets>
+    <dependencySet>
+      <unpack>true</unpack>
+      <scope>compile</scope>
+	  <excludes>
+	  	<exclude>cglib:cglib</exclude>
+		<exclude>com.mysema.querydsl:querydsl-sql</exclude>		
+		<exclude>com.mysema.querydsl:querydsl-jdo</exclude>
+		<exclude>org.slf4j:slf4j-api</exclude>
+		<exclude>org.slf4j:slf4j-log4j12</exclude>					
+	  </excludes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
+
diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
index 37aed4905..6171bc74b 100644
--- a/querydsl-jpa/pom.xml
+++ b/querydsl-jpa/pom.xml
@@ -165,11 +165,21 @@
 	  
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-        </configuration>
+		<executions>
+		  <execution>
+		  	<id>apt-one-jar</id>
+			<goals>
+			  <goal>single</goal>	
+			</goals>
+			<phase>package</phase>
+		  	<configuration>
+              <descriptors>
+                <descriptor>src/main/assembly.xml</descriptor>
+              </descriptors>
+			  <outputDirectory>${project.build.directory}</outputDirectory>
+            </configuration>
+		  </execution>	
+		</executions>        
       </plugin>	  
 	     
       <plugin>
diff --git a/querydsl-jpa/src/main/assembly.xml b/querydsl-jpa/src/main/assembly.xml
index 29b3cd1e8..7e17b4826 100644
--- a/querydsl-jpa/src/main/assembly.xml
+++ b/querydsl-jpa/src/main/assembly.xml
@@ -1,31 +1,35 @@
 <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/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>full-deps</id>
+  <id>apt-one-jar</id>
   <formats>
-    <format>zip</format>
+    <format>jar</format>
   </formats>
-  <files>
-    <file>
-      <source>../querydsl-root/LICENSE.txt</source>
-      <outputDirectory>/</outputDirectory>
-    </file>	
-  </files>
+  <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>target</directory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-	  <excludes>
-	    <exclude>*-sources.jar</exclude>	
-	  </excludes>	
-	  <outputDirectory>/lib</outputDirectory>
-    </fileSet>
-  </fileSets>	  
+      <directory>src/apt</directory>	
+	  <outputDirectory>/</outputDirectory>
+	  <includes>
+	    <include>**/*</include>	
+	  </includes>	
+	</fileSet>	
+  </fileSets>	
   <dependencySets>
     <dependencySet>
-      <outputDirectory>lib</outputDirectory>
+      <unpack>true</unpack>
+      <scope>compile</scope>
+	  <excludes>
+	  	<exclude>cglib:cglib</exclude>
+		<exclude>com.mysema.querydsl:querydsl-sql</exclude>
+		<exclude>com.mysema.querydsl:querydsl-jpa</exclude>		
+		<exclude>org.hibernate:hibernate-annotations</exclude>		
+		<exclude>org.hibernate:hibernate-entitymanager</exclude>		
+		<exclude>org.hibernate:hibernate-validator</exclude>
+		<exclude>org.slf4j:slf4j-api</exclude>
+		<exclude>org.slf4j:slf4j-log4j12</exclude>				
+	  </excludes>
     </dependencySet>
   </dependencySets>
 </assembly>
+
diff --git a/querydsl-root/dist.sh b/querydsl-root/dist.sh
index ef4474510..54b94c0fb 100644
--- a/querydsl-root/dist.sh
+++ b/querydsl-root/dist.sh
@@ -9,7 +9,7 @@ echo "Creating release bundles"
 for module in collections hibernate-search jpa jdo lucene sql
 do
   cd ../querydsl-$module
-  mvn -Dtest= clean package assembly:assembly
+  mvn -Dtest= clean package
 done
 
 echo "Creating reference documentation"
diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml
index dec09d51d..fbd52b028 100644
--- a/querydsl-root/pom.xml
+++ b/querydsl-root/pom.xml
@@ -158,12 +158,12 @@
     <plugins>
       <plugin>       
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-5</version>
-        <configuration>
-          <descriptors>
-            <descriptor>../querydsl-root/src/main/assembly.xml</descriptor>
-          </descriptors>
-          <outputDirectory>../querydsl-root/target/dist</outputDirectory>
+        <version>2.2-beta-5</version>
+		<configuration>
+          <descriptors>
+            <descriptor>../querydsl-root/src/main/assembly.xml</descriptor>
+          </descriptors>
+          <outputDirectory>../querydsl-root/target/dist</outputDirectory>
         </configuration>
       </plugin>     
       <plugin>