diff --git a/src/MAKE/Makefile.altix b/src/MAKE/Makefile.altix
index 73de8d8f6c..e0ca6dcf43 100644
--- a/src/MAKE/Makefile.altix
+++ b/src/MAKE/Makefile.altix
@@ -29,7 +29,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       
+MPI_INC =       -DMPICH_SKIP_MPICXX
 MPI_PATH = 
 MPI_LIB =	-lmpi
 
diff --git a/src/MAKE/Makefile.bgl b/src/MAKE/Makefile.bgl
index 64362e4f65..2f8484bf42 100644
--- a/src/MAKE/Makefile.bgl
+++ b/src/MAKE/Makefile.bgl
@@ -35,7 +35,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK
+MPI_INC =       -DMPICH_SKIP_MPICXX
 MPI_PATH = 
 MPI_LIB =	-lmpich.rts 
 
diff --git a/src/MAKE/Makefile.cygwin b/src/MAKE/Makefile.cygwin
index 9d9efc0a5f..1fd1617a49 100644
--- a/src/MAKE/Makefile.cygwin
+++ b/src/MAKE/Makefile.cygwin
@@ -29,7 +29,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH =	-L/cygdrive/c/cygwin/mpich2-1.0.4p1/lib
 MPI_LIB =	-lmpich
 
diff --git a/src/MAKE/Makefile.encanto b/src/MAKE/Makefile.encanto
index b88800a7c1..38530311f9 100644
--- a/src/MAKE/Makefile.encanto
+++ b/src/MAKE/Makefile.encanto
@@ -29,7 +29,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	-lmpich -lpthread
 
diff --git a/src/MAKE/Makefile.fink b/src/MAKE/Makefile.fink
index 4228b132a3..e8d55f16fa 100644
--- a/src/MAKE/Makefile.fink
+++ b/src/MAKE/Makefile.fink
@@ -30,8 +30,8 @@ LMP_INC =	-DLAMMPS_GZIP
 # LIB = name of MPI library
 
 MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi
+MPI_PATH =	
+MPI_LIB =	../STUBS/libmpi.a
 
 # FFT library, can be -DFFT_NONE if not using PPPM from KSPACE package
 # INC = -DFFT_FFTW, -DFFT_INTEL, -DFFT_NONE, etc, FFT compiler settings
diff --git a/src/MAKE/Makefile.g++ b/src/MAKE/Makefile.g++
index b8594536c7..5ff270d8ed 100755
--- a/src/MAKE/Makefile.g++
+++ b/src/MAKE/Makefile.g++
@@ -29,7 +29,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX
 MPI_PATH = 
 MPI_LIB =	-lmpich -lpthread
 
diff --git a/src/MAKE/Makefile.g++3 b/src/MAKE/Makefile.g++3
index 8401cd422a..f169fd016c 100755
--- a/src/MAKE/Makefile.g++3
+++ b/src/MAKE/Makefile.g++3
@@ -29,7 +29,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	-lmpich -lpthread
 
diff --git a/src/MAKE/Makefile.jaguar b/src/MAKE/Makefile.jaguar
index 4f0da1eb53..2e9f300b4b 100644
--- a/src/MAKE/Makefile.jaguar
+++ b/src/MAKE/Makefile.jaguar
@@ -29,7 +29,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	-lmpich -lpthread
 
diff --git a/src/MAKE/Makefile.linux b/src/MAKE/Makefile.linux
index 60bef6dc0f..85fc59b184 100755
--- a/src/MAKE/Makefile.linux
+++ b/src/MAKE/Makefile.linux
@@ -29,7 +29,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	-lmpich -lpthread
 
diff --git a/src/MAKE/Makefile.mac b/src/MAKE/Makefile.mac
index 9ef3eb281f..e313da697e 100755
--- a/src/MAKE/Makefile.mac
+++ b/src/MAKE/Makefile.mac
@@ -30,8 +30,8 @@ LMP_INC =	-DLAMMPS_GZIP
 # LIB = name of MPI library
 
 MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi
+MPI_PATH =	
+MPI_LIB =	../STUBS/libmpi.a
 
 # FFT library, can be -DFFT_NONE if not using PPPM from KSPACE package
 # INC = -DFFT_FFTW, -DFFT_INTEL, -DFFT_NONE, etc, FFT compiler settings
diff --git a/src/MAKE/Makefile.mkl b/src/MAKE/Makefile.mkl
index 2465b999a5..df6a7b4424 100644
--- a/src/MAKE/Makefile.mkl
+++ b/src/MAKE/Makefile.mkl
@@ -35,7 +35,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	-mt_mpi
 
diff --git a/src/MAKE/Makefile.sdsc b/src/MAKE/Makefile.sdsc
index 202c6c444b..95347131e9 100644
--- a/src/MAKE/Makefile.sdsc
+++ b/src/MAKE/Makefile.sdsc
@@ -34,7 +34,7 @@ LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_XDR
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	-lmpich.rts -lmsglayer.rts -lrts.rts -ldevices.rts 
 
diff --git a/src/MAKE/Makefile.seaborg b/src/MAKE/Makefile.seaborg
index 29b8b886f9..96a08024d6 100644
--- a/src/MAKE/Makefile.seaborg
+++ b/src/MAKE/Makefile.seaborg
@@ -30,7 +30,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	-lmpich -lpthread
 
diff --git a/src/MAKE/Makefile.serial b/src/MAKE/Makefile.serial
index ed9a344bc3..b9556af5e4 100755
--- a/src/MAKE/Makefile.serial
+++ b/src/MAKE/Makefile.serial
@@ -31,8 +31,8 @@ LMP_INC =	-DLAMMPS_GZIP
 # LIB = name of MPI library
 
 MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi
+MPI_PATH =
+MPI_LIB =	../STUBS/libmpi.a
 
 # FFT library, can be -DFFT_NONE if not using PPPM from kspace package
 # INC = -DFFT_FFTW, -DFFT_INTEL, -DFFT_NONE, etc, FFT compiler settings
diff --git a/src/MAKE/Makefile.serial_debug b/src/MAKE/Makefile.serial_debug
index ee26eb9f5d..77cd7fc5e3 100644
--- a/src/MAKE/Makefile.serial_debug
+++ b/src/MAKE/Makefile.serial_debug
@@ -30,8 +30,8 @@ LMP_INC =	-DLAMMPS_GZIP
 # LIB = name of MPI library
 
 MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi
+MPI_PATH =	
+MPI_LIB =	../STUBS/libmpi.a
 
 # FFT library, can be -DFFT_NONE if not using PPPM from KSPACE package
 # INC = -DFFT_FFTW, -DFFT_INTEL, -DFFT_NONE, etc, FFT compiler settings
diff --git a/src/MAKE/Makefile.solaris b/src/MAKE/Makefile.solaris
index d5d291c900..43903887d3 100644
--- a/src/MAKE/Makefile.solaris
+++ b/src/MAKE/Makefile.solaris
@@ -30,8 +30,8 @@ LMP_INC =	-DLAMMPS_GZIP
 # LIB = name of MPI library
 
 MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi
+MPI_PATH =	
+MPI_LIB =	../STUBS/libmpi.a
 
 # FFT library, can be -DFFT_NONE if not using PPPM from KSPACE package
 # INC = -DFFT_FFTW, -DFFT_INTEL, -DFFT_NONE, etc, FFT compiler settings
diff --git a/src/MAKE/Makefile.storm b/src/MAKE/Makefile.storm
index 315edd20e4..c31ac859d1 100644
--- a/src/MAKE/Makefile.storm
+++ b/src/MAKE/Makefile.storm
@@ -30,7 +30,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	
 
diff --git a/src/MAKE/Makefile.tacc b/src/MAKE/Makefile.tacc
index ca75594be0..10cdbd8648 100644
--- a/src/MAKE/Makefile.tacc
+++ b/src/MAKE/Makefile.tacc
@@ -29,7 +29,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	-lmpich -lpthread
 
diff --git a/src/MAKE/Makefile.tbird b/src/MAKE/Makefile.tbird
index c0f774b992..035ab60b98 100644
--- a/src/MAKE/Makefile.tbird
+++ b/src/MAKE/Makefile.tbird
@@ -48,7 +48,7 @@ LMP_INC =	-DLAMMPS_GZIP
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	-lmpich -lpthread
 
diff --git a/src/MAKE/Makefile.tesla b/src/MAKE/Makefile.tesla
index 04caa7f28f..8d8ee80fad 100755
--- a/src/MAKE/Makefile.tesla
+++ b/src/MAKE/Makefile.tesla
@@ -30,8 +30,8 @@ LMP_INC =	-DLAMMPS_GZIP
 # LIB = name of MPI library
 
 MPI_INC =       -I../STUBS
-MPI_PATH =	-L../STUBS
-MPI_LIB =	-lmpi
+MPI_PATH =	
+MPI_LIB =	../STUBS/libmpi.a
 
 # FFT library, can be -DFFT_NONE if not using PPPM from KSPACE package
 # INC = -DFFT_FFTW, -DFFT_INTEL, -DFFT_NONE, etc, FFT compiler settings
diff --git a/src/MAKE/Makefile.xt3 b/src/MAKE/Makefile.xt3
index ea9efd19ea..12eb42fe2e 100644
--- a/src/MAKE/Makefile.xt3
+++ b/src/MAKE/Makefile.xt3
@@ -31,7 +31,7 @@ LMP_INC =	-DLAMMPS_GZIP -DLAMMPS_XDR
 # PATH = path for MPI library
 # LIB = name of MPI library
 
-MPI_INC =       -DMPICH_IGNORE_CXX_SEEK 
+MPI_INC =       -DMPICH_SKIP_MPICXX 
 MPI_PATH = 
 MPI_LIB =	-lmpich -lpthread