diff --git a/extras/ChangeLog b/extras/ChangeLog
index 0fa48fbe4f..033f4822e8 100644
--- a/extras/ChangeLog
+++ b/extras/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-27  Ramon Novoa  <rnovoa@artica.es>
+
+	* pandora_update_version.sh: Include build number in the
+	  Windows agent installer for nightly builds.
+
 2011-10-27  Ramon Novoa  <rnovoa@artica.es>
 
 	* build_src.sh: Create symlinks needed to build RPM packages.
diff --git a/extras/pandora_update_version.sh b/extras/pandora_update_version.sh
index 2e4948d64f..9b8e79e04e 100755
--- a/extras/pandora_update_version.sh
+++ b/extras/pandora_update_version.sh
@@ -105,6 +105,11 @@ sed -e "s/{Pandora FMS Windows Agent v.*}/{Pandora FMS Windows Agent v$VERSION}/
 NUMERIC_VERSION=$(echo $VERSION | sed -e "s/\([0-9]*\.[0-9]*\).*/\1/")
 sed -n "1h;1!H;\${;g;s/[\r\n]InstallVersion[\r\n]{\S*}/\nInstallVersion\n{$NUMERIC_VERSION.0.0}/g;p;}" "$AGENT_WIN_MPI_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$AGENT_WIN_MPI_FILE"
 sed -n "1h;1!H;\${;g;s/[\r\n]Version[\r\n]{[^\n\r]*}/\nVersion\n{$BUILD}/g;p;}" "$AGENT_WIN_MPI_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$AGENT_WIN_MPI_FILE"
+if [ $NB == 1 ]; then
+	sed -n "1h;1!H;\${;g;s/[\r\n]Windows\,Executable[\r\n]{[^\n\r]*}/\nWindows\,Executable\n{\<\%AppName\%\>\-\<\%Version\%\>\-Setup\<\%Ext\%\>}}/g;p;}" "$AGENT_WIN_MPI_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$AGENT_WIN_MPI_FILE"
+else
+	sed -n "1h;1!H;\${;g;s/[\r\n]Windows\,Executable[\r\n]{[^\n\r]*}/\nWindows\,Executable\n{\<\%AppName\%\>\-Setup\<\%Ext\%\>}}/g;p;}" "$AGENT_WIN_MPI_FILE" > "$TEMP_FILE" && mv "$TEMP_FILE" "$AGENT_WIN_MPI_FILE"
+fi
 
 rm -f "$TEMP_FILE"