diff --git a/common/netjack.c b/common/netjack.c
index 141f4409..34c32fb9 100644
--- a/common/netjack.c
+++ b/common/netjack.c
@@ -58,9 +58,6 @@ $Id: net_driver.c,v 1.17 2006/04/16 20:16:10 torbenh Exp $
 #include "netjack.h"
 #include "netjack_packet.h"
 
-// JACK2
-//#include "control.h"
-
 #define MIN(x,y) ((x)<(y) ? (x) : (y))
 
 static int sync_state = 1;
diff --git a/common/netjack_packet.c b/common/netjack_packet.c
index a48f1824..52e7c7ad 100644
--- a/common/netjack_packet.c
+++ b/common/netjack_packet.c
@@ -74,9 +74,6 @@
 
 #include "netjack_packet.h"
 
-// JACK2 specific.
-//#include "control.h"
-
 #ifdef NO_JACK_ERROR
 #define jack_error printf
 #endif
diff --git a/windows/Setup/jack64.ci b/windows/Setup/jack64.ci
new file mode 100644
index 00000000..881bd9e0
--- /dev/null
+++ b/windows/Setup/jack64.ci
@@ -0,0 +1,142 @@
+<*project
+      version = 4 civer = "Free v4.14.5" winver = "2.6/5.1.2600" >
+   <output> .</>
+   <exename> Jack_v1.9.8_64_setup.exe</>
+   <digitsign> </>
+   <appname> Jack v1.9.8</>
+   <password> </>
+   <addlang> </>
+   <icon> Default - 2</>
+   <selfextr> 1</>
+   <voltype> nolimit</>
+   <volsize> </>
+   <volpattern> disk%i.pak</>
+   <load> </>
+   <loadtime> 1000</>
+   <checktype> admin</>
+   <chkname> </>
+   <chkmsg> </>
+   <dlgfont> Verdana,8</>
+   <lang> English</>
+   <theme> Green</>
+   <iface> leftlogo</>
+   <leftlogo> .\src\logo_installer.bmp</>
+   <logo> </>
+   <vb> </>
+   <dao> </>
+   <background> 0</>
+   <dlgwelcome> 1</>
+   <dlgreadme> .\src\README</>
+   <dlglic> .\src\gpl_installer.rtf</>
+   <dlgcustpath> </>
+   <dlgenfpath> 0</>
+   <dlgsavepath> 1</>
+   <dlgautoprog> 1</>
+   <dlgfinish> 1</>
+   <comptype> defnorm</>
+   <solid> 0</>
+   <srcfolder> </>
+   <ifexist> over</>
+   <runafter> </>
+   <runconfirm> 1</>
+   <uninclude> 1</>
+   <unicon> Uninstall - 2</>
+   <unshortcut> 1</>
+   <unrun> </>
+   <silent> 0</>
+   <unfeed> </>
+   <unautoclose> 1</>
+   <unfinish> 1</>
+   <bl> My Demo</>
+   <blurl> </>
+   <bghead> </>
+   <bgfoot> </>
+   <bgback> </>
+   <files listview >
+      <_><src>..\Release64\bin\libjack64.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>.\src\vcredist_x86.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjack64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjack64.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjackserver64.a</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjackserver64.lib</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjackserver64.def</><dest>inst</><custom>lib</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack_connect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack_disconnect.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack_load.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack_lsp.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack_metro.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack_unload.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jackd.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjack64.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libjackserver64.dll</><dest>sys</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\libsamplerate-0-x86_64.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\portaudio_x86_64.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_net.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_netone.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack_netsource.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_dummy.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_loopback.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_winmme.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\jack_portaudio.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\netmanager.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\audioadapter.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\Release64\bin\jack\netadapter.dll</><dest>inst</><custom>jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\control.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\intclient.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\jack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\jslist.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\midiport.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\ringbuffer.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\statistics.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\thread.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\transport.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\types.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>0</></>
+<_><src>..\..\common\jack\systemdeps.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
+<_><src>..\..\common\jack\weakjack.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
+<_><src>..\..\common\jack\weakmacros.h</><dest>inst</><custom>includes\jack</><ifexist>overnewer</><recurs>1</></>
+<_><src>.\JackRouter64.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\JackRouter.ini</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\qjackctl\mingwm10.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\qjackctl\qjackctl.exe</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\qjackctl\QtCore4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\qjackctl\QtGui4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\qjackctl\QtXml4.dll</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\src\COPYING</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+<_><src>.\src\README</><dest>inst</><custom></><ifexist>overnewer</><recurs>0</></>
+
+   </files>
+   <runx listview >
+<_><type>app</><path>inst</><file>vcredist_x86.exe</><cmdline></><wait>1</><workdir>inst</><custdir></><when>end</></>
+
+   </runx>
+   <registry listview >
+
+   </registry>
+   <shcut listview >
+<_><shpath>prog</><shname>Jack NetDriver</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d net</><workpath>inst</><workcust></><icon></></>
+<_><shpath>prog</><shname>Jack Portaudio</><tarpath>inst</><tarname>jackd.exe</><cmdline>-R -S -d portaudio</><workpath>inst</><workcust></><icon></></>
+<_><shpath>prog</><shname>Jack Control</><tarpath>inst</><tarname>qjackctl.exe</><cmdline></><workpath>inst</><workcust></><icon>jackdmp.exe</></>
+<_><shpath>prog</><shname>Jack Command</><tarpath>sys</><tarname>cmd.exe</><cmdline></><workpath>inst</><workcust></><icon></></>
+
+   </shcut>
+   <ini listview >
+
+   </ini>
+   <copy listview >
+
+   </copy>
+   <activex listview >
+      <_><path>inst</><name>JackRouter64.dll</></>
+
+   </activex>
+   <font listview >
+
+   </font>
+   <ext listview >
+
+   </ext>
+   <mreg listview >
+
+   </mreg>
+   <macros> Pathadd=</>
+</project>
diff --git a/windows/jack_audioadapter.cbp b/windows/jack_audioadapter.cbp
index 12e70704..b5b893d2 100644
--- a/windows/jack_audioadapter.cbp
+++ b/windows/jack_audioadapter.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -23,14 +23,14 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libsamplerate-0-x86_64" />
                     <Add library="libjackserver64" />
                     <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -46,14 +46,14 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libsamplerate-0-x86_64" />
                     <Add library="libjackserver64" />
                     <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack\audioadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\audioadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -70,7 +70,7 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libsamplerate-0-x86_64" />
                     <Add library="libjackserver64" />
                     <Add library="portaudio_x86_64" />
diff --git a/windows/jack_connect.cbp b/windows/jack_connect.cbp
index b18a5cb7..177bfca0 100644
--- a/windows/jack_connect.cbp
+++ b/windows/jack_connect.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack_connect" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_connect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -20,12 +20,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack_connect" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack_connect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -43,7 +43,7 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack_connect" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_connect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -57,7 +57,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_disconnect.cbp b/windows/jack_disconnect.cbp
index 3d351873..ae62e7fd 100644
--- a/windows/jack_disconnect.cbp
+++ b/windows/jack_disconnect.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack_disconnect" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_disconnect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -20,12 +20,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack_disconnect" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack_disconnect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -38,12 +38,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack_disconnect" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_disconnect" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -57,7 +57,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_dummy.cbp b/windows/jack_dummy.cbp
index 0b80cb68..2347be2c 100644
--- a/windows/jack_dummy.cbp
+++ b/windows/jack_dummy.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -21,12 +21,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -40,12 +40,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_dummy" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -60,7 +60,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_latent_client.cbp b/windows/jack_latent_client.cbp
index 01c08cce..d0130313 100644
--- a/windows/jack_latent_client.cbp
+++ b/windows/jack_latent_client.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack_latent_client" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_latent_client" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -20,12 +20,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack_latent_client" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack_latent_client" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -42,7 +42,7 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack_latent_client" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_latent_client" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -55,7 +55,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_load.cbp b/windows/jack_load.cbp
index 0e3c5082..43d6e59c 100644
--- a/windows/jack_load.cbp
+++ b/windows/jack_load.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack_load" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_load" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -20,12 +20,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack_load" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack_load" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -37,12 +37,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack_load" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_load" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -56,7 +56,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_loopback.cbp b/windows/jack_loopback.cbp
index 659f5a3f..3b7647af 100644
--- a/windows/jack_loopback.cbp
+++ b/windows/jack_loopback.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -21,12 +21,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -40,12 +40,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_loopback" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -60,7 +60,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_lsp.cbp b/windows/jack_lsp.cbp
index c4c68cdf..e96a484d 100644
--- a/windows/jack_lsp.cbp
+++ b/windows/jack_lsp.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack_lsp" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_lsp" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -21,11 +21,11 @@
 				</Compiler>
 				<Linker>
 					<Add library="libjack64" />
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack_lsp" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin64\jack_lsp" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -38,11 +38,11 @@
 				</Compiler>
 				<Linker>
 					<Add library="libjack64" />
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack_lsp" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_lsp" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -56,7 +56,7 @@
 				</Compiler>
 				<Linker>
 					<Add library="libjack64" />
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Release 32bits">
diff --git a/windows/jack_metro.cbp b/windows/jack_metro.cbp
index 35d5f34c..04358069 100644
--- a/windows/jack_metro.cbp
+++ b/windows/jack_metro.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack_metro" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -20,12 +20,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack_metro" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -38,12 +38,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack_metro" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -57,7 +57,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_netadapter.cbp b/windows/jack_netadapter.cbp
index 1218291f..6c0836dd 100644
--- a/windows/jack_netadapter.cbp
+++ b/windows/jack_netadapter.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack\netadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -21,13 +21,13 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
                     <Add library="libsamplerate-0-x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack\netadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -41,13 +41,13 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjackserver64" />
                     <Add library="libsamplerate-0-x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack\netadapter" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\netadapter" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -62,7 +62,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
                     <Add library="libsamplerate-0-x86_64" />
 				</Linker>
diff --git a/windows/jack_netdriver.cbp b/windows/jack_netdriver.cbp
index dde08488..b99f8201 100644
--- a/windows/jack_netdriver.cbp
+++ b/windows/jack_netdriver.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack\jack_net" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -21,12 +21,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack\jack_net" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -40,12 +40,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack\jack_net" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_net" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -60,7 +60,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_netmanager.cbp b/windows/jack_netmanager.cbp
index 4a03937c..871682a0 100644
--- a/windows/jack_netmanager.cbp
+++ b/windows/jack_netmanager.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack\netmanager" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -20,12 +20,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack\netmanager" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -38,12 +38,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack\netmanager" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\netmanager" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -57,7 +57,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_netonedriver.cbp b/windows/jack_netonedriver.cbp
index f44ac795..7617d3da 100644
--- a/windows/jack_netonedriver.cbp
+++ b/windows/jack_netonedriver.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -21,12 +21,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -40,12 +40,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_netone" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -60,7 +60,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_netsource.cbp b/windows/jack_netsource.cbp
index 33a6d281..246eabe9 100644
--- a/windows/jack_netsource.cbp
+++ b/windows/jack_netsource.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack_netsource" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -20,13 +20,13 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
                     <Add library="libsamplerate-0-x86_84" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack_netsource" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -39,13 +39,13 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjack64" />
                     <Add library="libsamplerate-0-x86_84" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack_netsource" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_netsource" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -59,7 +59,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
                     <Add library="libsamplerate-0-x86_84" />
 				</Linker>
diff --git a/windows/jack_portaudio.cbp b/windows/jack_portaudio.cbp
index 5e0b544a..f9ec33d5 100644
--- a/windows/jack_portaudio.cbp
+++ b/windows/jack_portaudio.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -29,13 +29,13 @@
 				</Compiler>
 				<Linker>
 					<Add directory="..\windows" />
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
                     <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -56,14 +56,14 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
 					<Add directory="..\windows" />
                     <Add library="libjackserver64" />
                     <Add library="portaudio_x86_64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_portaudio" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -85,7 +85,7 @@
 					<Add directory="portaudio" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
 					<Add directory="..\windows" />
                     <Add library="libjackserver64" />
                     <Add library="portaudio_x86_64" />
diff --git a/windows/jack_test.cbp b/windows/jack_test.cbp
index cee6fe99..8b301f62 100644
--- a/windows/jack_test.cbp
+++ b/windows/jack_test.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack_test" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_test" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -20,12 +20,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack_test" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack_test" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -38,12 +38,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack_test" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_test" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -57,7 +57,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_unload.cbp b/windows/jack_unload.cbp
index d401e8cf..d89df5ba 100644
--- a/windows/jack_unload.cbp
+++ b/windows/jack_unload.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack_unload" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_unload" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -19,12 +19,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack_unload" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack_unload" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug\64" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -36,12 +36,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack_unload" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack_unload" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -54,7 +54,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
diff --git a/windows/jack_winmme.cbp b/windows/jack_winmme.cbp
index 2b0aada0..bfabb287 100644
--- a/windows/jack_winmme.cbp
+++ b/windows/jack_winmme.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -28,12 +28,12 @@
 				</Compiler>
 				<Linker>
 					<Add directory="..\windows" />
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -53,13 +53,13 @@
 					<Add directory="winmme" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
 					<Add directory="..\windows" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jack\jack_winmme" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -80,7 +80,7 @@
 					<Add directory="winmme" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
 					<Add directory="..\windows" />
                     <Add library="libjackserver64" />
 				</Linker>
diff --git a/windows/jackd.cbp b/windows/jackd.cbp
index c019044a..b38dbbf1 100644
--- a/windows/jackd.cbp
+++ b/windows/jackd.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\jackd" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jackd" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -26,12 +26,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\jackd" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\jackd" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -49,12 +49,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\jackd" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\jackd" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -74,7 +74,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjackserver64" />
 				</Linker>
 			</Target>
diff --git a/windows/libjack.cbp b/windows/libjack.cbp
index ab602b77..ef61d312 100644
--- a/windows/libjack.cbp
+++ b/windows/libjack.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\libjack64" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\libjack64" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -49,7 +49,7 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\libjack64" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\libjack64" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -91,7 +91,7 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\libjack64" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\libjack64" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
diff --git a/windows/libjackserver.cbp b/windows/libjackserver.cbp
index 27ca9f4b..25e6338d 100644
--- a/windows/libjackserver.cbp
+++ b/windows/libjackserver.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\libjackserver64" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\libjackserver64" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -39,7 +39,7 @@
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\libjackserver64" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\libjackserver64" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
@@ -71,7 +71,7 @@
 				</Linker>
 			</Target>
             <Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\libjackserver64" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\libjackserver64" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64" />
 				<Option type="3" />
 				<Option compiler="mingw_64" />
diff --git a/windows/multiple_metro.cbp b/windows/multiple_metro.cbp
index d3016537..697bd95b 100644
--- a/windows/multiple_metro.cbp
+++ b/windows/multiple_metro.cbp
@@ -7,7 +7,7 @@
 		<Option compiler="mingw_64" />
 		<Build>
 			<Target title="Win32 Release 64bits">
-				<Option output="Release\bin64\multiple_metro" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\multiple_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -20,12 +20,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Debug 64bits">
-				<Option output="Debug\bin64\multiple_metro" prefix_auto="1" extension_auto="1" />
+				<Option output="Debug64\bin\multiple_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Debug64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -37,12 +37,12 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Debug\bin64" />
+					<Add directory="Debug64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>
 			<Target title="Win32 Profiling 64bits">
-				<Option output="Release\bin64\multiple_metro" prefix_auto="1" extension_auto="1" />
+				<Option output="Release64\bin\multiple_metro" prefix_auto="1" extension_auto="1" />
 				<Option object_output="Release64\" />
 				<Option type="1" />
 				<Option compiler="mingw_64" />
@@ -56,7 +56,7 @@
 					<Add directory="..\common" />
 				</Compiler>
 				<Linker>
-					<Add directory="Release\bin64" />
+					<Add directory="Release64\bin" />
                     <Add library="libjack64" />
 				</Linker>
 			</Target>