diff --git a/src/STUBS/Makefile.mingw32-cross b/src/STUBS/Makefile.mingw32-cross
index 3b885e7925..ae48039b6f 100644
--- a/src/STUBS/Makefile.mingw32-cross
+++ b/src/STUBS/Makefile.mingw32-cross
@@ -10,14 +10,14 @@ INC =		mpi.h
 
 # Definitions
 
-EXE =		libmpi.a
+EXE =		libmpi_mingw32.a
 OBJ = 		$(SRC:.c=.o)
 
 # System-specific settings
 
-CC =		i686-pc-mingw32-gcc
-CCFLAGS =	-O2 -Wall -march=i686 -mtune=generic -mfpmath=387 -mpc64 # -fPIC
-ARCHIVE =	i686-pc-mingw32-ar
+CC =	        i686-w64-mingw32-gcc
+CCFLAGS =	-O2 -Wall -march=i686 -mtune=generic -mfpmath=387 -mpc64
+ARCHIVE =	i686-w64-mingw32-ar
 ARCHFLAG =	rs
 
 # Target
@@ -28,7 +28,7 @@ $(EXE):	$(OBJ)
 # Clean
 
 clean:
-	rm *.o libmpi.a
+	rm *.o libmpi.a $(EXE) $(OBJ)
 
 # Compilation rules
 
diff --git a/src/STUBS/Makefile.mingw64-cross b/src/STUBS/Makefile.mingw64-cross
new file mode 100644
index 0000000000..cbaee8f3f1
--- /dev/null
+++ b/src/STUBS/Makefile.mingw64-cross
@@ -0,0 +1,40 @@
+# Makefile for MPI stubs - edit this for your platform
+
+SHELL = /bin/sh
+.IGNORE:
+
+# Files
+
+SRC =		mpi.c
+INC =		mpi.h
+
+# Definitions
+
+EXE =		libmpi_mingw64.a
+OBJ = 		$(SRC:.c=.o)
+
+# System-specific settings
+
+CC =	        x86_64-w64-mingw32-gcc
+CCFLAGS =	-O2 -Wall -march=core2 -mtune=core2 -msse2 -mpc64
+ARCHIVE =	x86_64-w64-mingw32-ar
+ARCHFLAG =	rs
+
+# Target
+
+$(EXE):	$(OBJ)
+	$(ARCHIVE) $(ARCHFLAG) $(EXE) $(OBJ)
+
+# Clean
+
+clean:
+	rm *.o libmpi.a $(EXE) $(OBJ)
+
+# Compilation rules
+
+.c.o:
+	$(CC) $(CCFLAGS) -c $<
+
+# Individual dependencies
+
+$(OBJ):	$(INC)