diff --git a/maven.xml b/maven.xml
index 8fe3fdf..6b4f336 100644
--- a/maven.xml
+++ b/maven.xml
@@ -438,10 +438,12 @@
         <ant:echo>| Creating: Axis2 Distributions</ant:echo>
         <ant:echo>+----------------------------------------------</ant:echo>
 
-        <ant:copy toDir="target/dist">
-            <ant:fileset file="modules/addressing/target/addressing.mar"/>
-            <ant:fileset file="modules/security/target/security.mar"/>
-        </ant:copy>
+        <ant:copy toFile="target/dist/addressing-${pom.currentVersion}.mar"
+                  file="modules/addressing/target/addressing.mar"/>
+
+        <ant:copy toFile="target/dist/security-${pom.currentVersion}.mar"
+                  file="modules/addressing/target/security.mar"/>
+
 
         <ant:delete dir="target/temp"/>
         <ant:delete dir="target/apidocs"/>
@@ -520,7 +522,8 @@
                 <ant:include name="**/modules/xml/**"/>
                 <ant:include name="**/modules/wsdl/**"/>
                 <ant:include name="**/modules/adb/**"/>
-                <ant:exclude name="**/SameServiceAddingTest.java"/> <!-- TODO: This is failing in the distros. Must Fix it. -->
+                <ant:exclude name="**/SameServiceAddingTest.java"/>
+                <!-- TODO: This is failing in the distros. Must Fix it. -->
                 <ant:exclude name="**/target/**"/>
                 <ant:exclude name="**/*class*/**"/>
                 <ant:exclude name="**/.svn/**"/>
@@ -653,7 +656,8 @@
                 <ant:include name="**/modules/doom/**"/>
                 <ant:include name="**/modules/addressing/**"/>
                 <ant:include name="**/modules/samples/**"/>
-                <ant:exclude name="**/SameServiceAddingTest.java"/> <!-- TODO: This is failing in the distros. Must Fix it. -->
+                <ant:exclude name="**/SameServiceAddingTest.java"/>
+                <!-- TODO: This is failing in the distros. Must Fix it. -->
                 <ant:exclude name="**/target/**"/>
                 <ant:exclude name="xdocs/**"/>
                 <ant:exclude name="**/*class*/**"/>
diff --git a/release-docs/maven-scripts/maven-std.xml b/release-docs/maven-scripts/maven-std.xml
index f4c55a0..71fbd7e 100644
--- a/release-docs/maven-scripts/maven-std.xml
+++ b/release-docs/maven-scripts/maven-std.xml
@@ -348,7 +348,7 @@
     <!-- ================================================================ -->
     <!--- Create the War -->
     <!-- ================================================================ -->
-    <goal name="war" prereqs="init">
+    <goal name="war" prereqs="init, jar">
         <ant:mkdir dir="target/temp/war/lib"/>
         <ant:mkdir dir="target/temp/war/toWEB-INF/modules"/>
         <ant:mkdir dir="target/temp/war/toWEB-INF/services"/>
@@ -380,7 +380,7 @@
             <ant:fileset file="modules/samples/target/toWar/services/version.aar"/>
         </ant:copy>
 
-        <ant:war destfile="target/dist/axis2-${pom.currentVersion}.war"
+        <ant:war destfile="target/dist/axis2.war"
                  webxml="modules/webapp/conf/web.xml">
             <ant:fileset dir="modules/webapp"/>
             <ant:lib dir="target/temp/war/lib">