diff --git a/pandora_agents/ChangeLog b/pandora_agents/ChangeLog
index 1a4569a2ab..eed60f2cbd 100644
--- a/pandora_agents/ChangeLog
+++ b/pandora_agents/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-09  Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* win32/configure.in, Makefile.am: Modified to compile executable with
+	version information embedded
+
+	* win32/versioninfo.rc: Added version information file for win32 
+	executable
+	Fixes: #3007874
+
+2010-07-07  Dario Rodriguez <dario.rodriguez@artica.es>
+
+	* win32/pandora_windows_service.h: Added constant for default port for
+	ftp and ssh 
+	
+	* win32/pandora_windows_service.cc: Added support for change ssh and ftp
+	port
+
 2010-07-05  Junichi Satoh  <junichi@rworks.jp>
 
 	* unix/pandora_agent_installer: Fixed typo and directory permission
diff --git a/pandora_agents/win32/Makefile.am b/pandora_agents/win32/Makefile.am
index 5a80b49a5a..7718b5ba52 100644
--- a/pandora_agents/win32/Makefile.am
+++ b/pandora_agents/win32/Makefile.am
@@ -7,3 +7,8 @@ PandoraAgent_SOURCES = misc/pandora_file.cc modules/pandora_data.cc modules/pand
 PandoraAgent_CXXFLAGS=-O2 -DCURL_STATICLIB
 endif
 PandoraAgent_LDFLAGS=-enable-auto-import
+
+LDADD = versioninfo.res
+
+.rc.res: 
+	$(WINDRES) $< -O coff -o $@
diff --git a/pandora_agents/win32/configure.in b/pandora_agents/win32/configure.in
index 4034334682..07bfeeefb9 100644
--- a/pandora_agents/win32/configure.in
+++ b/pandora_agents/win32/configure.in
@@ -20,6 +20,12 @@ CXXFLAGS=
 AC_ARG_ENABLE([debug], [  --enable-debug          produce debugging information (disabled by default)], debug="yes", debug="no")
 AM_CONDITIONAL(DEBUG, test "$debug" = "yes")
 
+# Checks for programs.
+AC_CHECK_TOOL([WINDRES], [windres], [no])
+if test "$WINDRES" = "no"; then
+	AC_MSG_ERROR([windres not found. You can get it from http://www.mingw.org/])
+fi
+
 # Checks for libraries.
 AC_CHECK_LIB([ws2_32], [main], , AC_MSG_ERROR([MingGW not found. You can get it from http://www.mingw.org/]))
 AC_CHECK_LIB([winmm], [main], , AC_MSG_ERROR([libwinmm not found.]))
@@ -52,4 +58,5 @@ AC_FUNC_REALLOC
 AC_CHECK_FUNCS([floor gethostbyname gettimeofday inet_ntoa memchr memmove memset regcomp select socket strchr strdup strrchr strtol])
 
 AC_CONFIG_FILES([Makefile])
+
 AC_OUTPUT
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
new file mode 100644
index 0000000000..6a76973383
--- /dev/null
+++ b/pandora_agents/win32/versioninfo.rc
@@ -0,0 +1,24 @@
+1 VERSIONINFO
+FILEVERSION     1,0,0,0
+PRODUCTVERSION  1,0,0,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "080904E4"
+    BEGIN
+      VALUE "CompanyName", "Artica ST"
+      VALUE "FileDescription", "Pandora FMS Agent for Windows Platform"
+      VALUE "LegalCopyright", "Artica ST"
+      VALUE "OriginalFilename", "PandoraAgent.exe"
+      VALUE "ProductName", "Pandora FMS Windows Agent"
+      VALUE "ProductVersion", "(3.1(Build 100608))"
+      VALUE "FileVersion", "1.0.0.0"
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x809, 1252
+  END
+END
+