diff --git a/client/Makefile b/client/Makefile
index cb4da5394445aaac60060e397337838e72dece42..9aa9c88b4682e7729ead1784e347e905af2aeed7 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -24,13 +24,16 @@ SRCDIR = src
 
 CC = gcc
 CFLAGS = -m32 -static -Wall -I$(SRCDIR) -I$(BUILD)/include
-LDFLAGS = -m32 -static -pthread
+LDFLAGS = -m32 -static
+WINCCFLAGS = -lws2_32
 
 GSOAPVER = 2.7
 GSOAPREL = 15
 GSOAPURL =  http://hivelocity.dl.sourceforge.net/project/gsoap2/gSOAP/gSOAP%20$(GSOAPVER).$(GSOAPREL)%20stable/gsoap_$(GSOAPVER).$(GSOAPREL).tar.gz
 #GSOAPURL = http://ufpr.dl.sourceforge.net/project/gsoap2/gSOAP/gSOAP%20$(GSOAPVER).$(GSOAPREL)%20stable/gsoap_$(GSOAPVER).$(GSOAPREL).tar.gz
 GSOAP = gsoap-$(GSOAPVER)
+WSDL2H = $(BUILD)/bin/wsdl2h
+SOAPCPP2 = $(BUILD)/bin/soapcpp2
 
 WSNAME = Seed2
 WSURL = http://seed.c3sl.ufpr.br/tomcat/axis/$(WSNAME).jws?wsdl
@@ -38,6 +41,9 @@ WSURL = http://seed.c3sl.ufpr.br/tomcat/axis/$(WSNAME).jws?wsdl
 .PHONY: all
 all: bin/client
 
+.PHONY: win
+win: bin/client.exe
+
 .PHONY: clean
 clean:
 	@rm -rf $(BUILD)
@@ -79,10 +85,10 @@ $(BUILD)/$(WSNAME).wsdl:
 	wget -O $@ $(WSURL)
 
 $(BUILD)/wsclient.h: $(BUILD)/bin/wsdl2h $(BUILD)/$(WSNAME).wsdl
-	$(BUILD)/bin/wsdl2h -c -o $@ $(BUILD)/$(WSNAME).wsdl
+	$(WSDL2H) -c -o $@ $(BUILD)/$(WSNAME).wsdl
 
 $(BUILD)/soapC.c: $(BUILD)/wsclient.h
-	$(BUILD)/bin/soapcpp2 -d $(BUILD) -C -w -x $(BUILD)/wsclient.h
+	$(SOAPCPP2) -d $(BUILD) -C -w -x $(BUILD)/wsclient.h
 
 $(BUILD)/soapC.o: $(BUILD)/soapC.c
 	$(CC) -o $@ -I$(BUILD) $(CFLAGS) -c $<
@@ -96,3 +102,12 @@ $(BUILD)/client.o: $(SRCDIR)/client.c $(BUILD)/soapC.o $(BUILD)/soapClient.o
 bin/client: $(BUILD)/client.o $(BUILD)/soapC.o $(BUILD)/soapClient.o $(BUILD)/lib/libgsoap.a
 	@mkdir -p bin
 	$(CC) -o $@ $(LDFLAGS) $^
+	
+#########################
+# win-client #
+#########################
+
+bin/client.exe: $(BUILD)/client.o $(BUILD)/soapC.o $(BUILD)/soapClient.o $(BUILD)/$(GSOAP)/gsoap/stdsoap2.c 
+	@mkdir -p bin
+	$(CC) -o $@ $(LDFLAGS) $^ $(WINCCFLAGS)
+
diff --git a/windows-installer/Makefile b/windows-installer/Makefile
index 9eb29b1dc992cbb0978aaf9650736b68c3d98b10..133efa7d2ec70d9bc66a711d67370e2d37c04817 100644
--- a/windows-installer/Makefile
+++ b/windows-installer/Makefile
@@ -4,6 +4,8 @@ WININSTDIR = $(PWD)
 SRCDIR = $(WININSTDIR)/src
 BUILDDIR = $(WININSTDIR)/build
 BINDIR = $(BUILDDIR)/bin
+GSOAPVER = 2.7
+GSOAP = gsoap-$(GSOAPVER)
 
 CLIENTDIR = $(WININSTDIR)/../client
 CLIENTBIN = $(CLIENTDIR)/bin/client.exe
@@ -11,12 +13,13 @@ CLIENTBIN = $(CLIENTDIR)/bin/client.exe
 INSTALLERSRC = ./src/installer.nsi
 
 COLLECTDIR = $(WININSTDIR)/../windows-collect
+WINGSOAP = "wine win-build/$(GSOAP)/gsoap/bin/win32/"
 
-all: client collect
+all: client collect installer
 	@mkdir -p $(BUILDDIR)
 	
 client:
-	@cd $(CLIENTDIR) && make win
+	@cd $(CLIENTDIR) && make win BUILD=win-build CC=i686-w64-mingw32-gcc WSDL2H=$(WINGSOAP)/wsdl2h.exe SOAPCPP2=$(WINGSOAP)/soapcpp2.exe
 	@mkdir -p $(BINDIR)
 	@cp $(CLIENTBIN) $(BINDIR)
 
@@ -26,9 +29,7 @@ collect:
 installer:
 	#@cd $(SRCDIR)
 	@$(MAKENSIS) $(INSTALLERSRC)
-	7z a -y ./build/data.7z ./build/ProInfoData.exe ./build/inep #./build/proxy
-	echo ";!@Install@!UTF-8! \
-Title=\"Software Installation\" \
-ExecuteFile=\"ProInfoData.exe\" \
-;!@InstallEnd@!\" " > build/7zip.conf
-	cat ./build/7zS.sfx build/7zip.conf ./build/data.7z > ProInfoData-1.0.0.exe
+	@mkdir -p "windows-agent"
+	@cp build/ProInfoData.exe "windows-agent"
+	@cp 7zS.sfx "windows-agent"
+