diff --git a/Makefile.win b/Makefile.win
index f3194ee2..0b17ac7e 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -1,10 +1,13 @@
 #CXX=x86_64-w64-mingw32-g++
-CXX=/usr/local/Cellar/mingw-w64/6.0.0_1/toolchain-x86_64/bin/x86_64-w64-mingw32-g++
+version=6.0.0_2
+build?=x86_64
+dir=/usr/local/Cellar/mingw-w64/${version}/toolchain-${build}/
+CXX=${dir}/bin/${build}-w64-mingw32-g++
 CXXFLAGS=-Wall -O3 -std=gnu++11 -DNDEBUG -static -lpthread -lpsapi
-INCLUDES := -I inc/ -isystem lib/ -isystem window/zlib-1.2.11/
+INCLUDES := -I inc/ -isystem lib/ -isystem window/zlib-1.2.11/ -isystem lib/eigen-git-mirror/
 CPPSRC := src/*.cpp
 OBJ := bgen_lib.o binaryplink.o genotype.o misc.o regression.o snp.o binarygen.o commander.o main.o plink_common.o prsice.o region.o reporter.o gzstream.o dcdflib.o fastlm.o
-ZLIB := window/zlib-1.2.11/libz.a /usr/local/Cellar/mingw-w64/6.0.0_1/toolchain-x86_64/x86_64-w64-mingw32/lib/libpsapi.a 
+ZLIB := window/zlib-1.2.11/libz.a ${dir}/${build}-w64-mingw32/lib/libpsapi.a 
 %.o: src/%.cpp
 		$(CXX) $(CXXFLAGS) $(INCLUDES) -c $< -o $@