diff --git a/build.xml b/build.xml
index cb69f466..3d01af33 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,5 @@
 <project name="DavMail" default="dist" basedir=".">
+    <property name="version" value="1.0"/>
 
     <path id="classpath">
         <pathelement location="classes"/>
@@ -32,12 +33,16 @@
     </target>
 
     <target name="dist" depends="compile">
+        <taskdef name="nsis" classname="net.sf.nsisant.Task">
+            <classpath location="lib/nsisant-1.2.jar"/>
+        </taskdef>
         <delete dir="dist"/>
         <mkdir dir="dist"/>
         <jar basedir="target/classes" destfile="dist/davmail.jar"/>
         <copy todir="dist/lib">
             <fileset dir="lib">
                 <include name="*.jar"/>
+                <exclude name="nsisant*.jar"/>
             </fileset>
         </copy>
         <copy todir="dist">
@@ -45,6 +50,16 @@
                 <include name="*.exe"/>
             </fileset>
         </copy>
+        <zip file="dist/davmail-${version}.zip">
+            <fileset dir="dist">
+                <include name="lib/*.jar"/>
+                <include name="*.jar"/>
+                <include name="davmail*.exe"/>
+            </fileset>
+        </zip>
+        <nsis script="davmail-setup.nsi" verbosity="4" out="build.log" noconfig="yes">
+            <define name="VERSION" value="${version}"/>
+        </nsis>
     </target>
 
 </project>
diff --git a/davmail-setup.nsi b/davmail-setup.nsi
index 99317d9e..d37f73e3 100644
--- a/davmail-setup.nsi
+++ b/davmail-setup.nsi
@@ -2,7 +2,7 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "DavMail"
-!define PRODUCT_VERSION "1.0"
+!define PRODUCT_VERSION "${VERSION}"
 !define PRODUCT_PUBLISHER "Mickaël Guessant"
 !define PRODUCT_WEB_SITE "http://sourceforge.net/projects/davmail"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\davmail.exe"
diff --git a/lib/nsisant-1.2.jar b/lib/nsisant-1.2.jar
new file mode 100644
index 00000000..99f0e4f4
Binary files /dev/null and b/lib/nsisant-1.2.jar differ