diff --git a/build.xml b/build.xml
index 2073e2fdd..70f22a631 100644
--- a/build.xml
+++ b/build.xml
@@ -182,6 +182,7 @@
   <delete file="${build}/yacy.java" failonerror="false"/>
   <copy file="${src}/yacy.java" tofile="${build}/yacy.java" overwrite="true" filtering="true" />
   <copy file="yacy-svn-3.spec" tofile="${release}/SPECS/yacy-svn.spec" overwrite="true" filtering="true" />
+  <copy file="yacy.nsi" tofile="${release}/WINDOWS/yacy.nsi" overwrite="true" filtering="true" />
   <!--<copy file="${doc}/Download.html" tofile="${doc}/Download.html.up" filtering="true" />-->
 </target>
   	
@@ -736,6 +737,7 @@
 	<mkdir dir="${release}/BUILD" />
 	<rpm specFile="yacy-svn.spec" topDir="${release}" />
 	<delete dir="${release}/SPECS" failonerror="false" />
+	<delete dir="${release}/WINDOWS" failonerror="false" />
 	<move file="${release}/RPMS/noarch/yacy-${releaseVersion}_${releaseNr}-3.noarch.rpm"
 		  tofile="${release}/yacy-${releaseVersion}_${releaseNr}-3.noarch.rpm" />
 	<move file="${release}/RPMS/noarch/yacy-libx-${releaseVersion}_${releaseNr}-3.noarch.rpm"
@@ -743,4 +745,13 @@
 	<delete dir="${release}/RPMS" failonerror="false" />
 </target>
 
+<!-- http://nsisant.sourceforge.net/ -->
+<taskdef name="nsis" classname="net.sf.nsisant.Task">
+        <classpath location="nsisant-1.2.jar"/>
+</taskdef>
+<target name="exe" depends="all" description="Creates the windows installer.exe">
+	<mkdir dir="${release}/WINDOWS" />
+	<nsis script="${release}/WINDOWS/yacy.nsi" nocd="yes" />
+</target>
+
 </project>
diff --git a/yacy.nsi b/yacy.nsi
index 212fbc30b..ee523c38f 100755
--- a/yacy.nsi
+++ b/yacy.nsi
@@ -4,7 +4,7 @@
 
 Name "YaCy"
 
-OutFile "yacy_v0.48_20061010_2743.exe"
+OutFile "RELEASE/WINDOWS/yacy_v@REPL_VERSION@_@REPL_DATE@_@REPL_REVISION_NR@.exe"
 InstallDir $PROGRAMFILES\YaCy
 
 SetCompress auto
@@ -17,7 +17,7 @@ InstType "Normal"
 InstType "Full"
 
 ; The text to prompt the user to enter a directory
-ComponentText "This will install YaCy v0.48 (Build 20061010) on your computer. Select which optional things you want to be installed."
+ComponentText "This will install YaCy v@REPL_VERSION@ (Build @REPL_DATE@) on your computer. Select which optional things you want to be installed."
 ; The text to prompt the user to enter a directory
 #DirText "If an old version was installed into another location (eg. AnomicHTTPProxy), you have to move the DATA Directory to the new location."
 DirText "Choose a directory to install into:"
@@ -164,9 +164,9 @@ Section "Development"
 	File "build.properties"
 	
 	SetOutPath "$INSTDIR\htroot"
-	File "HTROOT\*.java"
+	File "htroot\*.java"
 	SetOutPath "$INSTDIR\htroot\yacy"
-	File "HTROOT\yacy\*.java"
+	File "htroot\yacy\*.java"
 	SetOutPath "$INSTDIR\htroot\htdocsdefault"
 	File "htroot\htdocsdefault\*.java"
 	SetOutPath "$INSTDIR\htroot\www"