diff --git a/.gitignore b/.gitignore
index 1ef70917b..224f399db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -97,10 +97,10 @@ release_static_md/
 debug_static_md/
 release_static_mt/
 debug_static_mt/
-bin/
-bin64/
-lib/
-lib64/
+bin/*
+bin64/*
+lib/*
+lib64/*
 pocomsg.h
 
 # Eclipse generated files #
@@ -113,3 +113,22 @@ cmake-build/
 # Temporary files #
 ###################
 *.bak
+
+# openssl binaries #
+####################
+
+!openssl/out/win32/bin/debug/*.dll
+!openssl/out/win32/bin/debug/*.lib
+!openssl/out/win32/bin/release/*.dll
+!openssl/out/win32/bin/release/*.lib
+!openssl/out/win64/bin/debug/*.dll
+!openssl/out/win64/bin/debug/*.lib
+!openssl/out/win64/bin/release/*.dll
+!openssl/out/win64/bin/release/*.lib
+
+!openssl/out/win32/lib/debug/*.lib
+!openssl/out/win32/lib/debug/*.pdb
+!openssl/out/win32/lib/release/*.lib
+!openssl/out/win64/lib/debug/*.lib
+!openssl/out/win64/lib/debug/*.pdb
+!openssl/out/win64/lib/release/*.lib
\ No newline at end of file
diff --git a/Crypto/Crypto.progen b/Crypto/Crypto.progen
index b8e6f5828..4adc227b6 100644
--- a/Crypto/Crypto.progen
+++ b/Crypto/Crypto.progen
@@ -18,11 +18,12 @@ vc.project.linker.dependencies.release_static_md = Crypt32.lib
 vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
 vc.project.linker.dependencies.release_static_mt = Crypt32.lib
 bits = ${vc.project.platform.bits}
-vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\*
-vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\*
-vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${bits}\\*
-vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\*
-vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\*
-vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${bits}\\*
+dirbits = ${vc.project.platform.bindir.suffix}
+vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${dirbits}\\*
+vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${dirbits}\\*
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen
index 18d230a97..b1fcc2fc5 100644
--- a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen
+++ b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen
@@ -20,11 +20,12 @@ vc.project.linker.dependencies.release_static_md = Crypt32.lib
 vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
 vc.project.linker.dependencies.release_static_mt = Crypt32.lib
 bits = ${vc.project.platform.bits}
-vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\*
-vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${bits}\\*
-vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${bits}\\*
-vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\*
-vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${bits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${bits}\\*
-vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${bits}\\*
+dirbits = ${vc.project.platform.bindir.suffix}
+vc.project.prebuild.debug_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.debug_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.debug_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${dirbits}\\*
+vc.project.prebuild.release_shared = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.release_static_md = xcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\*\nxcopy /y ..\\openssl\\out\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\*
+vc.project.prebuild.release_static_mt = xcopy /y ..\\openssl\\out\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${dirbits}\\*
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
diff --git a/ProGen/src/ProGen.cpp b/ProGen/src/ProGen.cpp
index 992e2f839..65e910899 100644
--- a/ProGen/src/ProGen.cpp
+++ b/ProGen/src/ProGen.cpp
@@ -912,9 +912,16 @@ protected:
 						templatePath.pushDirectory(tool);
 						templatePath.pushDirectory(platform);
 						templatePath.pushDirectory(projectType);
-						if (platform == "Win32") pProjectConfig->setString("vc.project.platform.bits", "32");
-						else if (platform == "x64") pProjectConfig->setString("vc.project.platform.bits", "64");
-						else if (platform == "WinCE") pProjectConfig->setString("vc.project.platform.bits", "32");
+						if ((platform == "Win32") || (platform == "WinCE"))
+						{
+							pProjectConfig->setString("vc.project.platform.bits", "32");
+							pProjectConfig->setString("vc.project.platform.bindir.suffix", "");
+						}
+						else if (platform == "x64")
+						{
+							pProjectConfig->setString("vc.project.platform.bits", "64");
+							pProjectConfig->setString("vc.project.platform.bindir.suffix", "64");
+						}
 						else throw Poco::NotFoundException(Poco::format("Unknown platform: %s", platform));
 						generateProject(*pProjectConfig, projectPath, templatePath, platform, tool);
 					}