diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index cd66946d7f..ff839c2149 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -91,14 +91,10 @@ FIXME: this template has (at least) the following bugs:
         </option>
     </if>
 
-    <set var="WX_DEBUG_VARIABLE" overwrite="0">WX_DEBUG</set>
-    <set var="WX_DEBUG_VALUE_ON">1</set>
-    <set var="WX_DEBUG_VALUE_OFF">0</set>
-    
-    <if cond="not isdefined(WX_DEBUG_VARIABLE)">
+    <if cond="not isdefined('WX_DEBUG')">
         <set var="WX_DEBUG_DEFAULT" overwrite="0">1</set>
-        <option name="$(WX_DEBUG_VARIABLE)">
-            <values>$(WX_DEBUG_VALUE_OFF),$(WX_DEBUG_VALUE_ON)</values>
+        <option name="WX_DEBUG">
+            <values>0,1</values>
             <values-description>Release,Debug</values-description>
             <default-value>$(WX_DEBUG_DEFAULT)</default-value>
             <description>
@@ -132,19 +128,19 @@ FIXME: this template has (at least) the following bugs:
     <!--    The debug define we need with win32 compilers           -->    
     <!--    (on Linux, the wx-config program is used).              -->    
     <set var="WXDEBUG_DEFINE">        
-        <if cond="$(WX_DEBUG_VARIABLE)==$(WX_DEBUG_VALUE_ON)">__WXDEBUG__</if>    
+        <if cond="WX_DEBUG=='1'">__WXDEBUG__</if>    
     </set>
 
     <!--    These are handy ways of dealing with the                -->
     <!--    extensions in the library names of the                  --> 
     <!--    wxWindows library.                                      -->
     <set var="WXLIBPOSTFIX">
-        <if cond="$(WX_DEBUG_VARIABLE)==$(WX_DEBUG_VALUE_ON) and WX_UNICODE=='1'">ud</if>
-        <if cond="$(WX_DEBUG_VARIABLE)==$(WX_DEBUG_VALUE_ON) and WX_UNICODE=='0'">d</if>
-        <if cond="$(WX_DEBUG_VARIABLE)==$(WX_DEBUG_VALUE_OFF) and WX_UNICODE=='1'">u</if>
+        <if cond="WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if>
+        <if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>
+        <if cond="WX_DEBUG=='0' and WX_UNICODE=='1'">u</if>
     </set>
     <set var="WX3RDPARTYLIBPOSTFIX">
-        <if cond="$(WX_DEBUG_VARIABLE)==$(WX_DEBUG_VALUE_ON)">d</if>
+        <if cond="WX_DEBUG=='1'">d</if>
     </set>
 
     <set var="WXCPU">