diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index 4f7d3163fa..0c015e75cf 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -13,26 +13,45 @@
 <makefile>
 
 
+    <!--                                                            -->
     <!--                        OPTIONS                             -->
     <!--                                                            -->
-    <!--    These are essentially the configurations you            -->
-    <!--    want in bakefile.                                       -->
-    <!--                                                            -->
-    <!--    In MSVC these are the different build                   -->
-    <!--    configurations you can have (in the build menu),        -->
-    <!--    and in autoconf is enabled with enable-xxx=xx.          -->
-    <!--    For other compilers a separate configuration            -->
-    <!--    file is created (such as config.gcc on gcc)             -->
-    <!--    which has several options a user can modify.            -->
-    <!--                                                            -->
-    <!--    Note that the above only happens if an option           -->
-    <!--    is not constant, i.e. if it cannot be determined        -->
-    <!--    by bakefile itself.                                     -->
-    <!--    Also note that for 'autoconf' format these options      -->
-    <!--    are only useful when used together with wxpresets.m4    -->
-    <!--    macro file which contains macros for detecting the      -->
-    <!--    option values for wx-based projects. See wxpresets.m4   -->
-    <!--    comments for more info.    -->
+
+    <set var="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL">
+        <!-- 'NORMAL' here refers to the fact that the formats for which
+             FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL==1 only need
+             additional compiler and/or linker flags (see e.g. WXMACHINE_FLAG)
+         -->
+        <if cond="FORMAT in ['msvc']">1</if>
+        <if cond="FORMAT not in ['msvc']">0</if>
+    </set>
+    <set var="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS">
+        <!-- the formats for which FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS==1 
+             need special handling: see the docs of the MSVS_PLATFORMS variable in Bakefile docs.
+         -->
+        <if cond="FORMAT in ['msvs2005prj','msvs2008prj']">1</if>
+        <if cond="FORMAT not in ['msvs2005prj','msvs2008prj']">0</if>
+    </set>
+    <set var="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES">
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1'">1</if>
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS=='1'">1</if>
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='0' and FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS=='0'">0</if>
+    </set>
+    
+    <!--    This is a standard option that determines               -->
+    <!--    the architecture for which the lib/exe/dll later        -->
+    <!--    declared are meant.                                     -->
+    <if cond="not isdefined('TARGET_CPU') and FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1'">
+        <set var="TARGET_CPU_DEFAULT" overwrite="0">X86</set>
+        <option name="TARGET_CPU">
+            <values>X86,AMD64,IA64</values>
+            <values-description>i386-compatible,AMD 64 bit,Itanium 64 bit</values-description>
+            <default-value>$(TARGET_CPU_DEFAULT)</default-value>
+            <description>
+                Architecture of the CPU for which to build the executables and libraries
+            </description>
+        </option>
+    </if>
 
 
 
@@ -63,13 +82,26 @@
 
     <set var="WXCPU">
         <if cond="FORMAT=='msevc4prj'">_$(CPU)</if>
+        
+        <!-- just define the correct string for those formats which support the 'TARGET_CPU' option: -->
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1' and TARGET_CPU=='AMD64'">_amd64</if>
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1' and TARGET_CPU=='IA64'">_ia64</if>
+        
+        <!-- for MSVS projects instead of the 'TARGET_CPU' option we need to use the 'MSVS_PLATFORM' variable: -->
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_VIA_MSVS_PLATFORMS=='1' and MSVS_PLATFORM=='win64'">_amd64</if>
     </set>
-
+    
+    <set var="WXMACHINE_FLAG">
+        <!-- add the /MACHINE linker flag to formats with "normal" multiple-arch support when building in 64bit mode: -->
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1' and TARGET_CPU=='AMD64'">/MACHINE:AMD64</if>
+        <if cond="FORMAT_SUPPORTS_MULTIPLE_ARCHITECTURES_NORMAL=='1' and TARGET_CPU=='IA64'">/MACHINE:IA64</if>
+    </set>
+    
     <set var="WXLIBPATH">
         <if cond="WX_SHARED=='0'">$(DIRSEP)lib$(DIRSEP)$(COMPILER_PREFIX)$(WXCPU)_lib</if>
         <if cond="WX_SHARED=='1'">$(DIRSEP)lib$(DIRSEP)$(COMPILER_PREFIX)$(WXCPU)_dll</if>
     </set>
-
+    
     <!-- under Unix this is an option (detected at configure-time);
          under Windows this is not an user option! -->
     <set var="WX_PORT">
@@ -266,6 +298,8 @@
             <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
         </if>
 
+        <ldflags>$(WXMACHINE_FLAG)</ldflags>
+            
         <!-- wx libs must come before 3rd party and sys libs, this is
              the place where the hack explained above is carried on: -->
         <__wx-libs-point/>