diff --git a/project/Build.xml b/project/Build.xml
index 987abb53ad..8a1adf0904 100755
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -430,7 +430,7 @@
 				<lib name="rpcrt4.lib" if="LIME_HARFBUZZ" />
 				<lib name="dwrite.lib" if="LIME_HARFBUZZ" />
 
-				<lib name="comsuppw.lib" unless="winrt" />
+				<lib name="comsuppw.lib" unless="winrt || mingw" />
 
 				<lib name="D3D11.lib" if="winrt" />
 				<lib name="RuntimeObject.lib" if="winrt" />
diff --git a/project/src/system/System.cpp b/project/src/system/System.cpp
index f6bbbe8355..3640208915 100644
--- a/project/src/system/System.cpp
+++ b/project/src/system/System.cpp
@@ -42,7 +42,7 @@ namespace lime {
 	}
 
 
-	#if defined (HX_WINDOWS) && !defined (HX_WINRT)
+	#if defined (HX_WINDOWS) && !defined (HX_WINRT) && !defined (__MINGW32__)
 	std::wstring* GetWMIValue (BSTR query, BSTR field) {
 
 		HRESULT hres = 0;
@@ -139,7 +139,7 @@ namespace lime {
 
 	std::wstring* System::GetDeviceModel () {
 
-		#if defined (HX_WINDOWS) && !defined (HX_WINRT)
+		#if defined (HX_WINDOWS) && !defined (HX_WINRT) && !defined (__MINGW32__)
 		return GetWMIValue (bstr_t ("SELECT * FROM Win32_ComputerSystemProduct"), L"Version");
 		#endif
 
@@ -150,7 +150,7 @@ namespace lime {
 
 	std::wstring* System::GetDeviceVendor () {
 
-		#if defined (HX_WINDOWS) && !defined (HX_WINRT)
+		#if defined (HX_WINDOWS) && !defined (HX_WINRT) && !defined (__MINGW32__)
 		return GetWMIValue (bstr_t ("SELECT * FROM Win32_ComputerSystemProduct"), L"Vendor");
 		#endif
 
@@ -161,7 +161,7 @@ namespace lime {
 
 	std::wstring* System::GetPlatformLabel () {
 
-		#if defined (HX_WINDOWS) && !defined (HX_WINRT)
+		#if defined (HX_WINDOWS) && !defined (HX_WINRT) && !defined (__MINGW32__)
 		return GetWMIValue (bstr_t ("SELECT * FROM Win32_OperatingSystem"), L"Caption");
 		#endif
 
@@ -179,7 +179,7 @@ namespace lime {
 
 	std::wstring* System::GetPlatformVersion () {
 
-		#if defined (HX_WINDOWS) && !defined (HX_WINRT)
+		#if defined (HX_WINDOWS) && !defined (HX_WINRT) && !defined (__MINGW32__)
 		return GetWMIValue (bstr_t ("SELECT * FROM Win32_OperatingSystem"), L"Version");
 		#endif