diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml
new file mode 100644
index 0000000000..6ad22e645a
--- /dev/null
+++ b/activemq-all/pom.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+    http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0">
+  
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.activemq</groupId>
+    <artifactId>activemq-parent</artifactId>
+    <version>5.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>activemq-all</artifactId>
+  <packaging>jar</packaging>
+  <name>ActiveMQ :: Jar Bundle</name>
+  <description>Puts together an ActiveMQ jar bundle</description>
+
+  <dependencies>
+
+    <!-- activemq -->
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-console</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-optional</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-jaas</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-xmpp</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jms_1.1_spec</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+    </dependency>
+    
+    
+  </dependencies>
+
+  <build>
+    
+    <plugins>
+      <plugin>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>4.1-incubator</version>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>createbundle</goal>
+            </goals>
+            <configuration>
+              <includes>activemq-core,activemq-console,activemq-jaas,activemq-optional,geronimo-jms_1.1_spec,geronimo-j2ee-management_1.0_spec</includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 606be7e4f8..743ae0fada 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -46,7 +46,7 @@
     <!-- activemq -->
     <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-all</artifactId>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
@@ -285,7 +285,26 @@
   <build>
     
     <plugins>
-      <!-- Configure which tests are included/excuded -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unpack</id>
+            <phase>package</phase>
+            <goals>
+              <goal>unpack-dependencies</goal>
+            </goals>
+            <configuration>
+              <includeGroupIds>${pom.groupId}</includeGroupIds>
+              <includeArtifactIds>activemq-console</includeArtifactIds>
+              <outputDirectory>target/classes</outputDirectory>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>true</overWriteSnapshots>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -297,10 +316,10 @@
             <configuration>
               <tasks>
                 <jar destfile="target/run.jar" basedir="target/classes">
-                      <include name="org/apache/activemq/console/Main*.class"/>
-                      <manifest>
-                        <attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
-                      </manifest>
+                  <include name="org/apache/activemq/console/Main*.class"/>
+                  <manifest>
+                    <attribute name="Main-Class" value="org.apache.activemq.console.Main"/>
+                  </manifest>
                 </jar>
               </tasks>
             </configuration>
@@ -316,22 +335,6 @@
           <forkMode>pertest</forkMode>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>4.1-incubator</version>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <goals>
-              <goal>createbundle</goal>
-            </goals>
-            <configuration>
-              <includes>activemq-core,activemq-console,activeio-core,activemq-jaas,activemq-optional,commons-logging,geronimo-jms_1.1_spec,geronimo-j2ee-management_1.0_spec,derby</includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -424,7 +427,7 @@
                   </descriptors>
                 </configuration>
               </execution>
-			  <execution>
+              <execution>
                 <id>windows-src</id>
                 <phase>package</phase>
                 <goals>
@@ -438,7 +441,7 @@
               </execution>
             </executions>
           </plugin>
-    </plugins>
+        </plugins>
       </build>
     </profile>
   </profiles>
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/unix-bin.xml
index 132faadc4d..6f25d472ee 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/unix-bin.xml
@@ -84,13 +84,6 @@
     </fileSet>
 
     <!-- Copy over jar files -->
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>${pom.artifactId}-${pom.version}.jar</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>target</directory>
       <outputDirectory>/bin</outputDirectory>
@@ -134,6 +127,14 @@
 
   </fileSets>
   <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>${pom.groupId}:activemq-all</include>
+      </includes>
+    </dependencySet>
     <dependencySet>
       <outputDirectory>/lib</outputDirectory>
       <unpack>false</unpack>
diff --git a/assembly/src/main/descriptors/windows-bin.xml b/assembly/src/main/descriptors/windows-bin.xml
index 659016bf1e..8bbd600ad4 100644
--- a/assembly/src/main/descriptors/windows-bin.xml
+++ b/assembly/src/main/descriptors/windows-bin.xml
@@ -88,13 +88,6 @@
     </fileSet>
 
     <!-- Copy over jar files -->
-    <fileSet>
-      <directory>target</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>${pom.artifactId}-${pom.version}.jar</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>target</directory>
       <outputDirectory>/bin</outputDirectory>
@@ -139,6 +132,14 @@
   </fileSets>
 
   <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>${pom.groupId}:activemq-all</include>
+      </includes>
+    </dependencySet>
     <dependencySet>
       <outputDirectory>/lib</outputDirectory>
       <unpack>false</unpack>
diff --git a/pom.xml b/pom.xml
index 76a34dc0ff..7ab2d74b45 100755
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,7 @@
   </distributionManagement>
 
   <modules>
+    <module>activemq-all</module>
     <module>activemq-book</module>
     <module>activemq-core</module>
     <module>activemq-console</module>
@@ -206,6 +207,11 @@
       <!-- =============================== -->
       <!-- ActiveMQ Dependencies -->
       <!-- =============================== -->
+      <dependency>
+        <groupId>org.apache.activemq</groupId>
+        <artifactId>activemq-all</artifactId>
+        <version>${activemq-version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
         <artifactId>activemq-core</artifactId>