diff --git a/build/bakefiles/common.bkl b/build/bakefiles/common.bkl
index 453f466c87..1f84d4676e 100644
--- a/build/bakefiles/common.bkl
+++ b/build/bakefiles/common.bkl
@@ -589,6 +589,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
                 <!-- this one is only used if wxUSE_URL_NATIVE==1 but we don't
                      know if it is here so just add it unconditionally -->
                 <sys-lib>wininet</sys-lib>
+                <sys-lib>shlwapi</sys-lib>
             </if>
             <if cond="FORMAT=='borland'">
                 <sys-lib>oleacc</sys-lib>
diff --git a/build/bakefiles/wxpresets/presets/wx_win32.bkl b/build/bakefiles/wxpresets/presets/wx_win32.bkl
index fd8572cd21..715f6ea811 100644
--- a/build/bakefiles/wxpresets/presets/wx_win32.bkl
+++ b/build/bakefiles/wxpresets/presets/wx_win32.bkl
@@ -299,6 +299,7 @@
             <sys-lib>rpcrt4</sys-lib>
             <sys-lib>advapi32</sys-lib>
             <sys-lib>wsock32</sys-lib>
+            <sys-lib>shlwapi</sys-lib>
         </if>
 
         <!-- Libs common to both borland and MSVC               -->
diff --git a/build/msw/wx_core.vcxproj b/build/msw/wx_core.vcxproj
index 88a15226c1..ed39dc287b 100644
--- a/build/msw/wx_core.vcxproj
+++ b/build/msw/wx_core.vcxproj
@@ -900,6 +900,7 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)msw_%(Filename).obj</ObjectFileName>
     </ClCompile>
     <ClCompile Include="..\..\src\msw\statusbar.cpp" />
+    <ClCompile Include="..\..\src\msw\taskbarbutton.cpp" />
     <ClCompile Include="..\..\src\msw\textctrl.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">$(IntDir)msw_%(Filename).obj</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">$(IntDir)msw_%(Filename).obj</ObjectFileName>
@@ -1342,6 +1343,7 @@
     <ClInclude Include="..\..\include\wx\toolbook.h" />
     <ClInclude Include="..\..\include\wx\tooltip.h" />
     <ClInclude Include="..\..\include\wx\persist\toplevel.h" />
+    <ClInclude Include="..\..\include\wx\taskbarbutton.h" />
     <ClInclude Include="..\..\include\wx\toplevel.h" />
     <ClInclude Include="..\..\include\wx\treebase.h" />
     <ClInclude Include="..\..\include\wx\persist\treebook.h" />