diff --git a/build.xml b/build.xml
index 59aedaaa..fb2d4655 100644
--- a/build.xml
+++ b/build.xml
@@ -75,12 +75,13 @@
         </jarbundler>
         <delete dir="dist/DavMail.app/Contents/MacOS"/>
         <copy file="src/osx/DavMail.JavaApplicationStub.app.zip"
-              tofile="dist/DavMail.app.zip" overwrite="true"/>
-        <zip update="true" file="dist/DavMail.app.zip">
+              tofile="dist/DavMail-${version}.app.zip" overwrite="true"/>
+        <zip update="true" file="dist/DavMail-${version}.app.zip">
             <fileset dir="dist">
                 <include name="DavMail.app/**/*"/>
             </fileset>
         </zip>
+        <delete dir="dist/DavMail.app"/>
     </target>
 
     <target name="dist-deb">