diff --git a/pandora_agents/win32/Makefile.am b/pandora_agents/win32/Makefile.am
index 741688741e..4623ca29b7 100644
--- a/pandora_agents/win32/Makefile.am
+++ b/pandora_agents/win32/Makefile.am
@@ -6,7 +6,6 @@ else
 PandoraAgent_SOURCES = misc/pandora_file.cc modules/pandora_data.cc modules/pandora_module_factory.cc modules/pandora_module.cc modules/pandora_module_list.cc modules/pandora_module_plugin.cc modules/pandora_module_inventory.cc modules/pandora_module_freememory.cc modules/pandora_module_exec.cc modules/pandora_module_perfcounter.cc modules/pandora_module_proc.cc modules/pandora_module_tcpcheck.cc modules/pandora_module_freememory_percent.cc modules/pandora_module_freedisk.cc modules/pandora_module_freedisk_percent.cc modules/pandora_module_logevent.cc modules/pandora_module_service.cc modules/pandora_module_cpuusage.cc modules/pandora_module_wmiquery.cc modules/pandora_module_regexp.cc modules/pandora_module_ping.cc modules/pandora_module_snmpget.cc udp_server/udp_server.cc main.cc pandora_strutils.cc pandora.cc windows_service.cc pandora_agent_conf.cc windows/pandora_windows_info.cc windows/pandora_wmi.cc pandora_windows_service.cc misc/md5.c windows/wmi/disphelper.c ssh/libssh2/channel.c  ssh/libssh2/mac.c ssh/libssh2/session.c ssh/libssh2/comp.c ssh/libssh2/misc.c ssh/libssh2/sftp.c ssh/libssh2/crypt.c ssh/libssh2/packet.c ssh/libssh2/userauth.c ssh/libssh2/hostkey.c ssh/libssh2/publickey.c ssh/libssh2/kex.c ssh/libssh2/scp.c ssh/pandora_ssh_client.cc ssh/pandora_ssh_test.cc ftp/pandora_ftp_client.cc ftp/pandora_ftp_test.cc
 PandoraAgent_CXXFLAGS=-O2
 endif
-PandoraAgent_LDFLAGS=-static-libgcc -static-libstdc++
 
 LDADD = versioninfo.res
 
diff --git a/pandora_agents/win32/bin/libcurl.dll b/pandora_agents/win32/bin/libcurl.dll
deleted file mode 100644
index eb5792f436..0000000000
Binary files a/pandora_agents/win32/bin/libcurl.dll and /dev/null differ
diff --git a/pandora_agents/win32/bin/libeay32.dll b/pandora_agents/win32/bin/libeay32.dll
deleted file mode 100644
index d912a7d442..0000000000
Binary files a/pandora_agents/win32/bin/libeay32.dll and /dev/null differ
diff --git a/pandora_agents/win32/bin/libodbc++.dll b/pandora_agents/win32/bin/libodbc++.dll
deleted file mode 100755
index 4326b95da7..0000000000
Binary files a/pandora_agents/win32/bin/libodbc++.dll and /dev/null differ
diff --git a/pandora_agents/win32/bin/zlib1.dll b/pandora_agents/win32/bin/zlib1.dll
deleted file mode 100644
index 78809e30f0..0000000000
Binary files a/pandora_agents/win32/bin/zlib1.dll and /dev/null differ
diff --git a/pandora_agents/win32/configure.in b/pandora_agents/win32/configure.in
index fea92e4019..51a3f8f739 100644
--- a/pandora_agents/win32/configure.in
+++ b/pandora_agents/win32/configure.in
@@ -14,7 +14,8 @@ AC_PROG_CXX
 AC_PROG_CC
 
 # Get rid of the -g flag
-CXXFLAGS=
+CXXFLAGS=-DCURL_STATICLIB
+LDFLAGS="-static -static-libgcc -static-libstdc++"
 
 # Debugging
 AC_ARG_ENABLE([debug], [  --enable-debug          produce debugging information (disabled by default)], debug="yes", debug="no")
@@ -33,12 +34,12 @@ AC_CHECK_LIB([psapi], [main], , AC_MSG_ERROR([libpsapi not found.]))
 AC_CHECK_LIB([ole32], [main], , AC_MSG_ERROR([libole32 not found.]))
 AC_CHECK_LIB([oleaut32], [main], , AC_MSG_ERROR([liboleaut not found.]))
 AC_CHECK_LIB([uuid], [main], , AC_MSG_ERROR([libuuid not found.]))
-AC_CHECK_LIB([boost_regex], [main], , AC_MSG_ERROR([Boost.Regex not not found. Get it from http://www.boost.org/]))
-AC_CHECK_LIB([z], [main], , AC_MSG_ERROR([libz not found.]))
+AC_CHECK_LIB([boost_regex-mt-s], [main], , AC_MSG_ERROR([Boost.Regex not not found. Get it from http://www.boost.org/]))
 AC_CHECK_LIB([gdi32], [main], , AC_MSG_ERROR([libgdi32 not found.]))
 AC_CHECK_LIB([crypto], [main], , AC_MSG_ERROR([libcrypto not found.]))
 AC_CHECK_LIB([ssl], [main], , AC_MSG_ERROR([libssl not found.]))
 AC_CHECK_LIB([curl], [main], , AC_MSG_ERROR([libcurl not found.]))
+AC_CHECK_LIB([z], [main], , AC_MSG_ERROR([libz not found.]))
 
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h stddef.h stdlib.h string.h sys/socket.h sys/time.h unistd.h wchar.h])
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 7790b43953..667d6ab79c 100755
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -2390,7 +2390,7 @@ Windows,BuildSeparateArchives
 {No}
 
 Windows,Executable
-{<%AppName%>-<%Version%>-Setup<%Ext%>}
+{<%AppName%>-Setup<%Ext%>}
 
 Windows,FileDescription
 {<%AppName%> <%Version%> Setup}