diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index cf42045428..6227f5b553 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-12  Ramon Novoa  <rnovoa@artica.es>
+
+	* build.sh: Added to repository. Pandora Agent installer build script.
+
 2010-04-23  Sancho Lerena <slerena@artica.es>
 
 	* bin/pandora_agent.conf: Updated sample conf with some examples of
diff --git a/pandora_agents/win32/build.sh b/pandora_agents/win32/build.sh
new file mode 100755
index 0000000000..db06ccc7dc
--- /dev/null
+++ b/pandora_agents/win32/build.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+# Build the Pandora Agent installer.
+# The installer will be placed in ./installer/output/.
+# InstallJammer must be installed and in the PATH.
+
+./autogen.sh && ./configure --host=i586-mingw32msvc && make clean && make && cp PandoraAgent.exe bin/ && installjammer --build installer/pandora.mpi
+