diff --git a/mingw-w64-codelite-git/004-windows-headers-conflict.patch b/mingw-w64-codelite-git/004-windows-headers-conflict.patch
index 8d749e286b..7b82c7359f 100644
--- a/mingw-w64-codelite-git/004-windows-headers-conflict.patch
+++ b/mingw-w64-codelite-git/004-windows-headers-conflict.patch
@@ -13,23 +13,16 @@
  class OutputDebugStringThread : public wxThread
 --- a/Outline/outline_tab.cpp	2015-06-01 23:22:47.501600000 +0300
 +++ b/Outline/outline_tab.cpp	2015-06-01 23:39:02.750800000 +0300
-@@ -25,11 +25,14 @@
- 
- #include "outline_tab.h"
- #include "outline_symbol_tree.h"
--#include "event_notifier.h"
--#include "plugin.h"
+@@ -25,6 +25,9 @@
+ #include "bitmap_loader.h"
+ #include "clToolBar.h"
+ #include "cl_config.h"
 +#ifdef __WXMSW__
 +#include <wx/msw/winundef.h>
 +#endif
- #include <wx/stc/stc.h>
- #include <wx/menu.h>
- #include <wx/wupdlock.h>
-+#include "event_notifier.h"
-+#include "plugin.h"
+ #include "event_notifier.h"
+ #include "file_logger.h"
  #include "fileextmanager.h"
- 
- const wxEventType wxEVT_SV_GOTO_DEFINITION = wxNewEventType();
 --- a/CodeLite/SocketAPI/clSocketBase.h	2015-07-15 18:25:00.504000000 +0300
 +++ b/CodeLite/SocketAPI/clSocketBase.h	2015-07-15 18:34:16.400800000 +0300
 @@ -31,11 +31,12 @@
diff --git a/mingw-w64-codelite-git/PKGBUILD b/mingw-w64-codelite-git/PKGBUILD
index 432c8b28f4..6f1f6d35ed 100644
--- a/mingw-w64-codelite-git/PKGBUILD
+++ b/mingw-w64-codelite-git/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=mingw-w64-${_realname}-git
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
 provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=12.0.213.g1c1628da9
+pkgver=12.0.287.ge34dc76cb
 pkgrel=1
 pkgdesc="Open-source, cross platform IDE for the C/C++ programming languages (mingw-w64)"
 arch=('any')
@@ -38,7 +38,7 @@ sha256sums=('SKIP'
             '049c138e6c24a37a5c42e90fa01b7c8117aaf2265a7e0d92801152ae771ec5d2'
             'bdc8e27060fc4e614fd354c580f7a0d6615763397287912c160eb0285c148473'
             'fbed169ac80a8679c3b5fadb2521a61745c98eebb65050a088d82240b0da37d5'
-            'afa2c2e7fe4be8ca7b1ca4664914a5bb72c008007152e64ac5a83adc4897dd91'
+            '7ff9afc4b77941edcaea20c159c7085c136bd68a1e7c08da8958d0b9c3c97c9a'
             'ad3f971836dca9f723186cc9868ec157bee53858d69b8ab4ee16e92a7bd7d4cb'
             '1206b6453000e1dbe8058fb646c97599b2a072f4aad412047f439b288e662777'
             'a9e5539e31c664a84e42412cdd30b44699a92efb2fb6f51000010bb958c10219'