diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 2b127351a6..deb3ed321c 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -61,9 +61,16 @@
         <if cond="WXUNIV=='1'">__WXUNIVERSAL__</if>
     </set>
 
-    <set var="WXNAMEPREFIX">wx</set>
-    <set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
-    <set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
+    <if cond="FORMAT=='autoconf'">
+        <set var="WXNAMEPREFIX">wx</set>
+        <set var="WXNAMEPREFIXGUI">wx_$(PORTNAME)$(WXUNIVNAME)</set>
+        <set var="WXVERSIONTAG">-$(WXVER_MAJOR).$(WXVER_MINOR)</set>
+    </if>
+    <if cond="FORMAT!='autoconf'">
+        <set var="WXNAMEPREFIX">wx$(WXVER_MAJOR)$(WXVER_MINOR)</set>
+        <set var="WXNAMEPREFIXGUI">wx$(PORTNAME)$(WXUNIVNAME)$(WXVER_MAJOR)$(WXVER_MINOR)</set>
+        <set var="WXVERSIONTAG"></set>
+    </if>
 
     <set var="TOOLCHAIN_NAME">
         $(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
@@ -101,11 +108,24 @@
     <!-- =============================================================== -->
     <!--                        Templates for libs:                      -->
     <!-- =============================================================== -->
+
+    <set var="DEBUGFLAG">
+        <if cond="BUILD=='debug'">on</if>
+        <if cond="BUILD=='release'">off</if>
+    </set>
+    <set var="OPTIMIZEFLAG">
+        <if cond="BUILD=='debug'">speed</if>
+        <if cond="BUILD=='release'">off</if>
+    </set>
     
     <template id="anylib">
         <depends cond="FORMAT!='autoconf' and BUILDING_LIB=='1'">setup.h</depends>
         <dirname>$(LIBDIRNAME)</dirname>
         <install-to>$(LIBDIR)</install-to>
+        
+        <debug-info>$(DEBUGFLAG)</debug-info>
+        <optimize>$(OPTIMIZEFLAG)</optimize>
+        <threading>multi</threading>        
     </template>
 
 
@@ -125,13 +145,13 @@
     <!-- =============================================================== -->
     <!--                  Templates for wxWindows libs:                  -->
     <!-- =============================================================== -->
-    
+
     <template id="wx">
         <set var="wxid">$(wxwin.mk_wxid(id))</set>
         <define>__WX$(TOOLKIT)__</define>
         <define>$(WXUNIV_DEFINE)</define>
         <include>$(TOP_SRCDIR)include</include>
-        <lib-path>$(LIBDIRNAME)</lib-path>
+        <lib-path>$(LIBDIRNAME)</lib-path>        
         <include cond="FORMAT!='autoconf'">$(LIBDIRNAME)</include>
         <include>$(INC_TIFF)</include>
         <include>$(INC_JPEG)</include>
@@ -155,6 +175,8 @@
     <template id="wx_lib_b" template="wx,anylib">
         <set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
         <libname>$(WXLIBNAME)</libname>
+        <precomp-headers>on</precomp-headers>
+        <precomp-headers-file>wxprec</precomp-headers-file>
     </template>
     
     <template id="wx_dll_b" template="wx_lib_b">
diff --git a/build/bakefiles/common_samples.bkl b/build/bakefiles/common_samples.bkl
index e3b8c4a661..4352f8bcc1 100644
--- a/build/bakefiles/common_samples.bkl
+++ b/build/bakefiles/common_samples.bkl
@@ -15,12 +15,18 @@
             </if>
         </set>
     </if>
+
+    <set var="DLLFLAG">
+        <if cond="SHARED=='1'">WXUSINGDLL</if>
+    </set>
     
     <template id="wx_sample" template="wx">
         <include>$(SRCDIR)</include>
         <!-- Always link against the wxWin library in monolithic build: -->
         <sys-lib>$(WXLIB_MONO)</sys-lib>
         <ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
+        <define>$(DLLFLAG)</define>
+        <app-type>gui</app-type>
 
         <mac-res cond="FORMAT=='autoconf'">$(MACOSX_RESOURCES)</mac-res>
     </template>
diff --git a/build/bakefiles/config.bkl b/build/bakefiles/config.bkl
index 6327f332d8..d6649fd549 100644
--- a/build/bakefiles/config.bkl
+++ b/build/bakefiles/config.bkl
@@ -72,7 +72,10 @@
         <set var="SAMPLES_RPATH_FLAG"/>
         <option name="EXTRALIBS"/>
 
-        <set var="SRCDIR">..</set>
+        <set var="SRCDIR">
+            <if cond="BUILDING_LIB=='1'">..</if>
+            <if cond="BUILDING_LIB=='0'">.</if>
+        </set>
         <set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
         <set var="BUILDDIR">objs_$(COMPILER)</set>
     </if>
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index bf106ed8c4..114bae7083 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -868,6 +868,8 @@
 <set var="MSW_LOWLEVEL_HDR">
 </set>
 <set var="MSW_SRC">
+    src/generic/statusbr.cpp
+    src/msw/uxtheme.cpp
     src/msw/ole/access.cpp
     src/msw/accel.cpp
     src/msw/bmpbuttn.cpp