diff --git a/pom.xml b/pom.xml
index 566c731..dca5fdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -295,6 +295,7 @@
             <version>2.3</version>
             <configuration>
               <tarLongFileMode>gnu</tarLongFileMode>
+              <finalName>apache-mrunit-${project.version}-${envClassifier}</finalName>
               <descriptors>
                 <descriptor>src/main/assembly/src-assembly.xml</descriptor>
               </descriptors>
@@ -314,10 +315,10 @@
             <version>2.3</version>
             <configuration>
               <tarLongFileMode>gnu</tarLongFileMode>
+              <finalName>apache-mrunit-${project.version}-${envClassifier}</finalName>
               <descriptors>
                 <descriptor>src/main/assembly/bin-assembly.xml</descriptor>
               </descriptors>
-              <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </plugin>
         </plugins>
diff --git a/src/main/assembly/bin-assembly.xml b/src/main/assembly/bin-assembly.xml
index 79ae96f..cba50a5 100644
--- a/src/main/assembly/bin-assembly.xml
+++ b/src/main/assembly/bin-assembly.xml
@@ -23,6 +23,8 @@
 
   <id>bin</id>
 
+  <baseDirectory>apache-mrunit-${project.version}-${envClassifier}</baseDirectory>
+
   <formats>
     <format>tar.gz</format>
   </formats>
diff --git a/src/main/assembly/src-assembly.xml b/src/main/assembly/src-assembly.xml
index 19e32e0..8eb04c3 100644
--- a/src/main/assembly/src-assembly.xml
+++ b/src/main/assembly/src-assembly.xml
@@ -23,7 +23,7 @@
 
   <id>src</id>
 
-  <baseDirectory>${project.build.finalName}-src</baseDirectory>
+  <baseDirectory>apache-mrunit-${project.version}-${envClassifier}</baseDirectory>
 
   <formats>
     <format>tar.gz</format>