Index: /issm/trunk-jpl/configs/config-win7-32.sh
===================================================================
--- /issm/trunk-jpl/configs/config-win7-32.sh	(revision 15306)
+++ /issm/trunk-jpl/configs/config-win7-32.sh	(revision 15307)
@@ -11,5 +11,5 @@
 	--with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-petsc-arch=$ISSM_ARCH  \
-	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/  \
-	--with-mpi-lib="-Wl,libpetsc.lib" \
-	--with-mpi-include="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni" 
+	--with-mpi-lib-dir="$ISSM_DIR/externalpackages/petsc/install/lib" \
+   --with-mpi-libs="-Wl,libpetsc.lib" \
+	--with-mpi-include-dir="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni" 
Index: /issm/trunk-jpl/configs/config-win7-64.sh
===================================================================
--- /issm/trunk-jpl/configs/config-win7-64.sh	(revision 15306)
+++ /issm/trunk-jpl/configs/config-win7-64.sh	(revision 15307)
@@ -11,4 +11,5 @@
 	--with-petsc-arch=$ISSM_ARCH  \
 	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/  \
-	--with-mpi-lib="$ISSM_DIR/externalpackages/petsc/install/lib/libpetsc.lib" \
-	--with-mpi-include="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni" 
+	--with-mpi-lib-dir="$ISSM_DIR/externalpackages/petsc/install/lib" \
+   --with-mpi-libs="-Wl,libpetsc.lib" \
+	--with-mpi-include-dir="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni" 
Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 15306)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 15307)
@@ -541,4 +541,5 @@
 	dnl }}}
 	dnl mpi{{{
+   dnl Old MPI options
 	AC_MSG_CHECKING(for mpi)
 	AC_ARG_WITH([mpi-lib],
@@ -549,4 +550,18 @@
 	  AS_HELP_STRING([--with-mpi-include=DIR],[mpi include directory, necessary for parallel build]),
 	  [MPI_INCLUDE=$withval],[MPI_INCLUDE=""])
+
+   dnl New MPI options
+	AC_ARG_WITH([mpi-include-dir],
+	  AS_HELP_STRING([--with-mpi-include-dir=DIR],[mpi include directory, necessary for parallel build]),
+	  [MPI_INCLUDE=$withval],[MPI_INCLUDE=""])
+
+	AC_ARG_WITH([mpi-lib-dir],
+	  AS_HELP_STRING([--with-mpi-lib-dir=DIR],[mpi lib directory, necessary for parallel build]),
+	  [MPILIB_DIR=$withval],[MPILIB_DIR=""])
+
+	AC_ARG_WITH([mpi-libs],
+	  AS_HELP_STRING([--with-mpi-libs=LIBS],[mpi libraries to be used, necessary for parallel build]),
+	  [MPILIB=$withval],[MPILIB=""])
+
 	
 	if test -z "$MPILIB" ; then
@@ -557,5 +572,13 @@
 		else
 			HAVE_MPI=yes
+		   if  test $VENDOR = intel-win32; then
+            MPILIB_DIR=`cygpath -m $MPILIB_DIR`
+            MPIINCL=-L`cygpath -m $MPIINCL`
+         elif test $VENDOR = intel-win64; then
+            MPILIB_DIR=-L`cygpath -m $MPILIB_DIR`
+            MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
+         fi
 			MPIINCL=-I"$MPI_INCLUDE"
+         MPILIB="$MPILIB_DIR $MPILIB"
 			AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
 			AC_DEFINE([HAVE_MPI],[1],[Mpi Flag for Dakota (DO NOT REMOVE)])
@@ -564,4 +587,5 @@
 		fi
 	fi
+
 	AM_CONDITIONAL([MPI], [test x$HAVE_MPI = xyes])
 	AC_MSG_RESULT($HAVE_MPI)