diff --git a/Makefile b/Makefile
index 7587cb204..a122f1366 100644
--- a/Makefile
+++ b/Makefile
@@ -312,8 +312,13 @@ win32: $(LIBS_WINE32)
 	$(MAKE) BUILDING_FOR_WINE=true -C source/discovery win32
 
 win32r: $(LIBS_RWIN32)
+ifeq ($(CC),x86_64-w64-mingw32-gcc)
+	$(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ -C source/bridges-plugin win32
+	$(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ -C source/discovery win32
+else
 	$(MAKE) -C source/bridges-plugin win32
 	$(MAKE) -C source/discovery win32
+endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Binaries (win64)
@@ -343,8 +348,13 @@ win64: $(LIBS_WINE64)
 	$(MAKE) BUILDING_FOR_WINE=true -C source/discovery win64
 
 win64r: $(LIBS_RWIN64)
+ifeq ($(CC),i686-w64-mingw32-gcc)
+	$(MAKE) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ -C source/bridges-plugin win64
+	$(MAKE) CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ -C source/discovery win64
+else
 	$(MAKE) -C source/bridges-plugin win64
 	$(MAKE) -C source/discovery win64
+endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Binaries (wine)
diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile
index f55f75206..e1cdd32a1 100644
--- a/source/bridges-plugin/Makefile
+++ b/source/bridges-plugin/Makefile
@@ -44,12 +44,12 @@ LIBS_native   = $(MODULEDIR)/jackbridge.a
 LIBS_arm32    = $(MODULEDIR)/jackbridge.arm32.a
 LIBS_posix32  = $(MODULEDIR)/jackbridge.posix32.a
 LIBS_posix64  = $(MODULEDIR)/jackbridge.posix64.a
-ifeq ($(BUILDING_FOR_WINDOWS),true)
-LIBS_win32    = $(MODULEDIR)/jackbridge.win32.a
-LIBS_win64    = $(MODULEDIR)/jackbridge.win64.a
-else
+ifeq ($(BUILDING_FOR_WINE),true)
 LIBS_win32    = $(MODULEDIR)/jackbridge.win32e.a
 LIBS_win64    = $(MODULEDIR)/jackbridge.win64e.a
+else
+LIBS_win32    = $(MODULEDIR)/jackbridge.win32.a
+LIBS_win64    = $(MODULEDIR)/jackbridge.win64.a
 endif
 LINK_FLAGS   += $(JACKBRIDGE_LIBS)