diff --git a/Makefile.mac b/Makefile.mac
index 8b13789..ae6170f 100644
--- a/Makefile.mac
+++ b/Makefile.mac
@@ -1 +1,122 @@
+HOMEL=$(PWD)
+TOP=../bin
+BIN=$(HOMEL)/../bin
+
+override LDLIBS += -lgsl -lblas -llapack -lgfortran -lm -lnick
+# Some Linux distributions require separate lapacke library
+# override LDLIBS += -llapacke
+override LDFLAGS += -L./nicksrc
+override CFLAGS += -c -g -Wimplicit -I./ -I./nicksrc
+# Mac additions using homebrew installations
+#override CFLAGS += -I/usr/local/opt/openblas/include -I/usr/local/opt/gsl/include
+#override LDFLAGS += -L/usr/local/opt/openblas/lib -L/usr/local/opt/gsl/lib
+override LDFLAGS +=  -lgfortran
+CPPFLAGS="-I/usr/local/opt/lapack/include"
+# Harvard Medical School O2 cluster additions
+
+ND = nicksrc
+NLIB = $(ND)/libnick.a
+
+PROGS= qp3Pop qpDstat qpF4ratio qpAdm qpWave qp4diff dowtjack expfit.sh  qpBound qpGraph qpreroot qpff3base qpDpart qpfstats qpfmv
+PROGS3 = rolloff rolloffp convertf mergeit simpjack2
+
+
+PROGS2 = rexpfit.r  wtjack.pl 
+
+all: $(NLIB) $(PROGS) 
+
+
+$(NLIB):
+	$(MAKE) -C $(ND)
+
+## an ubuntu user found he needed: make all LDLIBS="-llapack" 
+
+statsubs.o:     tables nicksrc/statsubs.c
+	$(CC)  $(CFLAGS) -o statsubs.o nicksrc/statsubs.c
+
+expfit.sh:	expfit.templ
+	sed -e "s&BBBIN&$(BIN)&" < expfit.templ > expfit.sh
+	chmod +x expfit.sh
+
+qpDstat: $(NLIB) qpDstat.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+qpDpart: $(NLIB) qpDpart.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+qp3Pop: $(NLIB) qp3Pop.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+qp4diff: $(NLIB) qp4diff.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+qpF4ratio: $(NLIB) qpF4ratio.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+qpF4ratio: $(NLIB) qpF4ratio.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+qpf4diff: $(NLIB) f4diff.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+qpfstats: $(NLIB) qpfstats.o qpgsubs.o qpsubs.o mcio.o admutils.o egsubs.o regsubs.o ldsubs.o
+
+qpfmv: $(NLIB) qpfmv.o qpsubs.o mcio.o ldsubs.o admutils.o  egsubs.o regsubs.o  eigsubs.o eigx.o
+
+
+rolloff: $(NLIB) rolloff.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+rolloffp: $(NLIB) rolloffp.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+qpBound: $(NLIB) qpBound.o qpsubs.o mcio.o ldsubs.o admutils.o  egsubs.o regsubs.o
+
+dowtjack: $(NLIB) dowtjack.o
+
+convertf: $(NLIB) convertf.o mcio.o admutils.o egsubs.o h2d.o exclude.o
+
+mergeit: $(NLIB) mergeit.o mcio.o admutils.o egsubs.o h2d.o exclude.o
+
+grabpars: $(NLIB) grabpars.o
+
+qpff3base: $(NLIB) qpff3base.o qpgsubs.o qpsubs.o mcio.o admutils.o egsubs.o regsubs.o ldsubs.o
+
+qpAdm: $(NLIB) qpAdm.o qpsubs.o mcio.o ldsubs.o admutils.o  egsubs.o regsubs.o f4rank.o  eigsubs.o eigx.o
+
+qpWave: $(NLIB) qpWave.o qpsubs.o mcio.o ldsubs.o admutils.o  egsubs.o regsubs.o f4rank.o eigsubs.o eigx.o
+
+simpjack2: $(NLIB) simpjack2.o
+
+install:	all dirs tables
+	mkdir -p $(TOP)
+	cp $(PROGS) $(TOP)
+	cp $(PROGS2) $(TOP)
+
+uninstall:
+	rm -f tables
+	rm -f $(TOP)/*
+
+tables:    
+	echo "tables made"  > tables
+	cp twtable  $(HOMEL)/admixtables
+	
+dirs:	
+	mkdir -p  $(HOMEL)/admixtables
+
+clean: 
+	rm -f *.o 
+	rm -f *junk*
+	rm -f core
+	$(MAKE) -C $(ND) clean
+	rm -f $(PROGS)
+
+clobber: clean rmdirs uninstall
+
+
+rmdirs: 
+	rm -rf $(HOMEL)/admixtables 
+
+## gsl-config may help here
+
+
+qpGraph: $(NLIB) qpGraph.o gslqp.o qpgsubs.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+
+qpreroot: qpreroot.o qpgsubs.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+gcount: gcount.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o
+
+kimf: kimf.o gslkim.o qpgsubs.o qpsubs.o mcio.o ldsubs.o admutils.o egsubs.o regsubs.o