diff --git a/Makefile.mingw b/Makefile.mingw
index e6da082..acfff64 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -1,8 +1,8 @@
-CC=/usr/bin/i686-pc-mingw32-gcc
-CXX=/usr/bin/i686-pc-mingw32-g++
-STRIP=/usr/bin/i686-pc-mingw32-strip
-CFLAGS=-O2 -D_FILE_OFFSET_BITS=64 -g
-CXXFLAGS=-O2 -Wall -D_FILE_OFFSET_BITS=64 -g
+CC=/usr/bin/i686-w64-mingw32-gcc
+CXX=/usr/bin/i686-w64-mingw32-g++
+STRIP=/usr/bin/i686-w64-mingw32-strip
+CFLAGS=-O2 -Wall -static -static-libgcc -static-libstdc++  -D_FILE_OFFSET_BITS=64 -g
+CXXFLAGS=-O2 -Wall -static -static-libgcc -static-libstdc++ -D_FILE_OFFSET_BITS=64 -g
 #CXXFLAGS=-O2 -Wall -D_FILE_OFFSET_BITS=64 -I /usr/local/include -I/opt/local/include -g
 LIB_NAMES=guid gptpart bsd parttypes attributes crc32 mbrpart basicmbr mbr gpt support diskio diskio-windows
 MBR_LIBS=support diskio diskio-windows basicmbr mbrpart
@@ -15,13 +15,13 @@
 all:	gdisk fixparts
 
 gdisk:	$(LIB_OBJS) gdisk.o gpttext.o
-	$(CXX) $(LIB_OBJS) gdisk.o gpttext.o -lrpcrt4 -static-libgcc -o gdisk.exe
+	$(CXX) $(CXXFLAGS) $(LIB_OBJS) gdisk.o gpttext.o -lrpcrt4 -static-libgcc -o gdisk32.exe
 
 sgdisk: $(LIB_OBJS) sgdisk.o
-	$(CXX) $(LIB_OBJS) sgdisk.o -lpopt -static-libgcc -o sgdisk.exe
+	$(CXX) $(CXXFLAGS) $(LIB_OBJS) sgdisk.o -lpopt -static-libgcc -o sgdisk32.exe
 
 fixparts: $(MBR_LIB_OBJS) fixparts.o
-	$(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -static-libgcc -o fixparts.exe
+	$(CXX) $(CXXFLAGS) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -static-libgcc -o fixparts32.exe
 
 lint:	#no pre-reqs
 	lint $(SRCS)
@@ -30,7 +30,7 @@
 	rm -f core *.o *~ gdisk.exe sgdisk.exe
 
 strip:	#no pre-reqs
-	$(STRIP) gdisk.exe fixparts.exe
+	$(STRIP) gdisk32.exe fixparts32.exe
 
 # what are the source dependencies
 depend: $(SRCS)