diff --git a/build/bakefiles/wxpresets/presets/wx_unix.bkl b/build/bakefiles/wxpresets/presets/wx_unix.bkl
index a9d3d3684d..6cf291d7c2 100644
--- a/build/bakefiles/wxpresets/presets/wx_unix.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_unix.bkl
@@ -73,9 +73,12 @@ Format-specific notes:
         </error>
     </if>
     
-    <template id="wx">
+    <template id="wx-lib">
         <cxxflags>$(WX_CXXFLAGS)</cxxflags>
         <cflags>$(WX_CFLAGS)</cflags>
+    </template>
+
+    <template id="wx" template="wx-lib">
         <ldlibs>$(WX_LIBS)</ldlibs>
     </template>
 
diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index fbc2759cc2..afabe9fcf3 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -167,7 +167,8 @@ FIXME: this template has (at least) the following bugs:
               position="before:__wx-libs-point"/>
     
 
-    <template id="wx">
+    <!-- template for static wx libraries: -->
+    <template id="wx-lib">
         <!--                    MISCELLANEOUS                       -->
         <if cond="FORMAT=='mingw'">                    
             <define>HAVE_W32API_H</define>
@@ -180,7 +181,11 @@ FIXME: this template has (at least) the following bugs:
 
         <include>$(WX_DIR)$(WXLIBINCLUDE)</include>
         <include>$(WX_DIR)/include</include>
-
+    </template>
+    
+   
+    <!-- template for wx executables/dlls: -->
+    <template id="wx" template="wx-lib">
         <lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
 
         <!-- wx libs must come before 3rd party and sys libs, this is