diff --git a/src/Makefile.inc.guillimin.intel.mvapich2 b/src/Makefile.inc.guillimin.intel.mvapich2
new file mode 100644
index 0000000000000000000000000000000000000000..37aa5867ac255f05cb790c84d9a892a756af054e
--- /dev/null
+++ b/src/Makefile.inc.guillimin.intel.mvapich2
@@ -0,0 +1,94 @@
+# Define our compilers.................................
+#
+# MVAPICH2
+MPI_HOME=/software/tools/mvapich2-1.6-intel
+F90    = $(MPI_HOME)/bin/mpif90
+F77    = $(MPI_HOME)/bin/mpif90
+CC     = $(MPI_HOME)/bin/mpicc
+
+#AR=ar
+AR=xiar
+BITS=_v0.2a-intel_12.0.4-mvapich2_1.6
+
+#IMKL = /software/compilers/intel/composerxe-2011.4.191/mkl/include
+IMKL = /software/libraries/MKL/10.3/include
+INCLUDE=-I$(IMKL)
+
+# Define FORTRAN compiler flags.......................
+#
+# For the PGI compiler
+#F90FLAGS  = -O0
+#F77FLAGS  = -O0
+#F90FLAGS  = -O1
+#F77FLAGS  = -O1
+#F90FLAGS  = -O2
+#F77FLAGS  = -O2
+#F90FLAGS  = -O3
+#F77FLAGS  = -O3
+#F90FLAGS  = -fast
+#F77FLAGS  = -fast
+#F90FLAGS  = -O0 -mp -tpp7 -g -debug all -check all -implicitnone -warn unused -fp-stack-check -heap-arrays -ftrapuv -check pointers -check bounds
+#F77FLAGS  = -O0 -mp -tpp7 -g -debug all -check all -implicitnone -warn unused -fp-stack-check -heap-arrays -ftrapuv -check pointers -check bounds
+#F90FLAGS  = -O0 -i8 -fp-model strict -g -debug all -implicitnone -fp-stack-check -heap-arrays -ftrapuv -check pointers
+#F77FLAGS  = -O0 -i8 -fp-model strict -g -debug all -implicitnone -fp-stack-check -heap-arrays -ftrapuv -check pointers
+F90FLAGS  = -O0 -fp-model strict -g -debug all -traceback
+F77FLAGS  = -O0 -fp-model strict -g -debug all -traceback
+#F90FLAGS  = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0
+#F77FLAGS  = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0
+
+# Define C compiler flags.............................
+#
+#CFLAGS  = -O0 -I.
+#CFLAGS  = -O1 -I.
+#CFLAGS  = -O2 -I.
+#CFLAGS  = -O3 -I.
+#CFLAGS  = -fast -I.
+#CFLAGS  = -O0 -DMKL_ILP64 -I. -fp-model strict -g -debug all
+CFLAGS  = -O0 -I. -fp-model strict -g -debug all -traceback
+#CFLAGS  = -O0 -check all -warn all,nodec,interfaces -gen_interfaces -traceback -fpe0
+
+# Libraries.............................
+
+# Intel MKL libs
+LMKL = /software/libraries/MKL/10.3/lib/intel64
+
+# MPI
+MPI = -L$(MPI_HOME)/lib -lmpich
+
+WSMP = /home/dwhipp/software/wsmp/wsmp-Linux64-Intel/lib/mpi2
+
+LIBS = \
+ -LOCTREE -lOctree$(BITS) \
+ -LNN -lnn_f$(BITS) \
+ -LNN -lnn_c$(BITS) \
+ -LCASCADE -lcascade$(BITS) \
+ -LRESAMPLE -lresample$(BITS) \
+ -L$(LMKL) -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread \
+ -L$(WSMP) -lpwsmp64 \
+ $(MPI)
+
+ #-L$(LMKL) -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 \
+ #-L$(LMKL) -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread \
+
+# The Makefiles look at compile output with this
+PAGER=more
+
+# compile rules.......................................
+#
+COMPILE_OUT=$(NAME)$(BITS).compile
+.SUFFIXES:
+.SUFFIXES: .o .c .f .f90
+.f90.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F90) $(F90FLAGS) $(INCLUDES) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F90) $(F90FLAGS) $(INCLUDES) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.f.o:
+	@echo "--"                                   >>$(COMPILE_OUT) 2>&1
+	@echo "$(F77) $(F77FLAGS) $(INCLUDES) -c $<" >>$(COMPILE_OUT) 2>&1
+	$(F77) $(F77FLAGS) $(INCLUDES) -c $<         >>$(COMPILE_OUT) 2>&1
+
+.c.o:
+	@echo "--"                                 >>$(COMPILE_OUT) 2>&1
+	@echo "$(CC) $(CFLAGS) -c $<"              >>$(COMPILE_OUT) 2>&1
+	$(CC) $(CFLAGS) -c $<                      >>$(COMPILE_OUT) 2>&1