diff --git a/setup/win32/Makefile b/setup/win32/Makefile
index 2efa1db6f69ebdf3904a5dfd62fa340b0b97c822..3644d7fe0db359299ae158c9527ac0407615ae60 100644
--- a/setup/win32/Makefile
+++ b/setup/win32/Makefile
@@ -5,12 +5,10 @@ include Makefile.servicename
 SERVER_DIRECTORY=../..
 FILES_DIRECTORY=release
 
-LAUNCH_PY2EXE_SERVICE=/cygdrive/c/python${PYTHON_VERSION}/python.exe win32_setup.py py2exe
-LAUNCH_PY2EXE=/cygdrive/c/python${PYTHON_VERSION}/python.exe setup.py py2exe
-
 MAKENSIS_ARGUMENTS=/DVERSION=$(VERSION) /DSERVICENAME=${SERVICENAME}
 
 LAUNCH_MAKENSIS=/cygdrive/c/tools/cygwin/makensis $(MAKENSIS_ARGUMENTS) setup.nsi
+WINPY_DIR=/cygdrive/c/odoobuild/WinPython/python-3.6.2
 
 default: allinone
 
@@ -27,8 +25,11 @@ server_clean:
 	rm -rf $(SERVER_DIRECTORY)/.cyg*
 
 allinone: server_clean
-	#(cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_PY2EXE_SERVICE))
-	#(cd $(SERVER_DIRECTORY) && $(LAUNCH_PY2EXE))
+	cp $(SERVER_DIRECTORY)/requirements.txt $(WINPY_DIR)/
+	-(cd $(WINPY_DIR) && ./python.exe -m pip install --upgrade pip)
+	-(cd $(WINPY_DIR) && cat requirements.txt | while read PAC ; do Scripts/pip3.exe install "$${PAC}" ; done)
+	-(cd $(WINPY_DIR) && Scripts/pip3.exe freeze)
+	rm $(WINPY_DIR)/requirements.txt
 	(cd $(SERVER_DIRECTORY)/setup/win32 && $(LAUNCH_MAKENSIS))
 	(cd $(SERVER_DIRECTORY)/setup/win32 && mkdir -p $(FILES_DIRECTORY))
 	(cd $(SERVER_DIRECTORY)/setup/win32 && cp openerp-*.exe $(FILES_DIRECTORY)/openerp-server-setup-$(VERSION).exe)