diff --git a/assembly/pom.xml b/assembly/pom.xml
index 225efa6a55..40b5d883b9 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -230,6 +230,30 @@
     
     <plugins>
       <!-- Configure which tests are included/excuded -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.1</version>
+        <executions>
+          <execution>
+            <id>run-jar</id>
+            <phase>package</phase>
+            <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>
+                </jar>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
@@ -268,7 +292,7 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.1</version>
         <executions>
-          <execution>
+          <!-- execution>
             <id>run</id>
             <phase>package</phase>
             <goals>
@@ -278,14 +302,15 @@
               <descriptors>
                  <descriptor>src/main/descriptors/run-jar.xml</descriptor>
               </descriptors>
-              <finalName>activemq-${pom.version}</finalName>
+              <finalName>run</finalName>
+              <appendAssemblyId>false</appendAssemblyId>
               <archive>
                 <manifest>
                   <mainClass>org.apache.activemq.console.Main</mainClass>
                 </manifest>
               </archive>
             </configuration>
-          </execution>
+          </execution -->
           <execution>
             <id>bin</id>
             <phase>package</phase>