diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index deb3ed321c..f882d35246 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -128,6 +128,10 @@
         <threading>multi</threading>        
     </template>
 
+    <template id="3rdparty_lib" template="anylib">
+        <libname>$(id)$(WXDEBUGFLAG)</libname>
+    </template>
+
 
     <!-- =============================================================== -->
     <!--                         3rd party libs:                         -->
diff --git a/build/bakefiles/jpeg.bkl b/build/bakefiles/jpeg.bkl
index e166c53906..8f7521e079 100644
--- a/build/bakefiles/jpeg.bkl
+++ b/build/bakefiles/jpeg.bkl
@@ -14,7 +14,7 @@
         <if cond="wxUSE_LIBJPEG=='builtin'">$(SRCDIR)/src/jpeg</if>
     </set>
 
-    <lib id="wxjpeg" template="anylib"
+    <lib id="wxjpeg" template="3rdparty_lib"
          cond="wxUSE_LIBJPEG=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
diff --git a/build/bakefiles/odbc.bkl b/build/bakefiles/odbc.bkl
index f76a8d2f1e..ca2c0ca129 100644
--- a/build/bakefiles/odbc.bkl
+++ b/build/bakefiles/odbc.bkl
@@ -17,7 +17,7 @@
         <if cond="wxUSE_ODBC=='builtin'">$(SRCDIR)/src/odbc</if>
     </set>
 
-    <lib id="wxodbc" template="anylib"
+    <lib id="wxodbc" template="3rdparty_lib"
          cond="wxUSE_ODBC=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
diff --git a/build/bakefiles/png.bkl b/build/bakefiles/png.bkl
index 2f6b6d74de..6f83cf4050 100644
--- a/build/bakefiles/png.bkl
+++ b/build/bakefiles/png.bkl
@@ -14,7 +14,7 @@
         <if cond="wxUSE_LIBPNG=='builtin'">$(SRCDIR)/src/png</if>
     </set>
 
-    <lib id="wxpng" template="anylib"
+    <lib id="wxpng" template="3rdparty_lib"
          cond="wxUSE_LIBPNG=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <include>$(INC_ZLIB)</include>
diff --git a/build/bakefiles/regex.bkl b/build/bakefiles/regex.bkl
index 4a07538688..41b7301dd2 100644
--- a/build/bakefiles/regex.bkl
+++ b/build/bakefiles/regex.bkl
@@ -14,7 +14,7 @@
         <if cond="wxUSE_REGEX=='builtin'">$(SRCDIR)/src/regex</if>
     </set>
 
-    <lib id="wxregex" template="anylib"
+    <lib id="wxregex" template="3rdparty_lib"
          cond="wxUSE_REGEX=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
diff --git a/build/bakefiles/tiff.bkl b/build/bakefiles/tiff.bkl
index 453d8570bc..87d711ad01 100644
--- a/build/bakefiles/tiff.bkl
+++ b/build/bakefiles/tiff.bkl
@@ -19,7 +19,7 @@
         <if cond="PLATFORM_WIN32=='1'">src/tiff/tif_win32.c</if>
     </set>
     
-    <lib id="wxtiff" template="anylib"
+    <lib id="wxtiff" template="3rdparty_lib"
          cond="wxUSE_LIBTIFF=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>
diff --git a/build/bakefiles/zlib.bkl b/build/bakefiles/zlib.bkl
index 18020fa730..21c75be96c 100644
--- a/build/bakefiles/zlib.bkl
+++ b/build/bakefiles/zlib.bkl
@@ -14,7 +14,7 @@
         <if cond="wxUSE_ZLIB=='builtin'">$(SRCDIR)/src/zlib</if>
     </set>
 
-    <lib id="wxzlib" teplate="anylib"
+    <lib id="wxzlib" teplate="3rdparty_lib"
          cond="wxUSE_ZLIB=='builtin' and BUILDING_LIB=='1'">
         <dirname>$(LIBDIRNAME)</dirname>
         <sources>