diff --git a/plugins/FeedReader/FeedReader.pro b/plugins/FeedReader/FeedReader.pro
index 64c698fe6..022412a3f 100644
--- a/plugins/FeedReader/FeedReader.pro
+++ b/plugins/FeedReader/FeedReader.pro
@@ -91,14 +91,13 @@ win32 {
 
 	#Have to reorder libs, else got /libs/lib/libcrypto.a(bio_lib.o):bio_lib.c:(.text+0x0): multiple definition of `BIO_new'
 	LIBS = -lcurl -lxml2 -lz -lxslt -lws2_32 -lwldap32 -lssl -lcrypto -lgdi32 $${LIBS}
-	exists(C:/msys32/mingw32/include) {
-		message(msys2 xml2 is installed.)
-		INC_DIR  += "C:/msys32/mingw32/include/libxml2"
-	}
-	exists(C:/msys64/mingw32/include) {
-		message(msys2 xml2 is installed.)
-		INC_DIR  += "C:/msys64/mingw32/include/libxml2"
+
+	# Check for msys2
+	!isEmpty(PREFIX_MSYS2) {
+		message(Use msys2 xml2.)
+		INC_DIR  += "$${PREFIX_MSYS2}/include/libxml2"
 	}
+
 	DEPENDPATH += . $$INC_DIR
 	INCLUDEPATH += . $$INC_DIR
 }
diff --git a/retroshare.pri b/retroshare.pri
index f8d57ca78..9a864a5ea 100644
--- a/retroshare.pri
+++ b/retroshare.pri
@@ -45,16 +45,11 @@ win32 {
 		isEmpty(INC_DIR)  { INC_DIR  = "$${PREFIX}/include" }
 		isEmpty(LIB_DIR)  { LIB_DIR  = "$${PREFIX}/lib" }
 	}
-	exists(C:/msys32/mingw32/include) {
-		message(msys2 32b is installed.)
-		PREFIX_MSYS2   = "C:/msys32/mingw32"
-		BIN_DIR  += "$${PREFIX_MSYS2}/bin"
-		INC_DIR  += "$${PREFIX_MSYS2}/include"
-		LIB_DIR  += "$${PREFIX_MSYS2}/lib"
-	}
-	exists(C:/msys64/mingw32/include) {
-		message(msys2 64b is installed.)
-		PREFIX_MSYS2   = "C:/msys64/mingw32"
+
+	# Check for msys2
+	PREFIX_MSYS2 = $$(MINGW_PREFIX)
+	!isEmpty(PREFIX_MSYS2) {
+		message(msys2 is installed.)
 		BIN_DIR  += "$${PREFIX_MSYS2}/bin"
 		INC_DIR  += "$${PREFIX_MSYS2}/include"
 		LIB_DIR  += "$${PREFIX_MSYS2}/lib"