diff --git a/src/MAKE/Makefile.g++ b/src/MAKE/Makefile.g++
index 4ca8d5dba0..76c0bcffd6 100755
--- a/src/MAKE/Makefile.g++
+++ b/src/MAKE/Makefile.g++
@@ -1,4 +1,4 @@
-# g++ = RedHat Linux box, g++, MPICH, FFTW
+# g++ = RedHat Linux box, g++, MPICH2, FFTW
 
 SHELL = /bin/sh
 #.IGNORE:
@@ -6,14 +6,12 @@ SHELL = /bin/sh
 # System-specific settings
 
 CC =		g++
-CCFLAGS =	-g -O -I/home/sjplimp/tools/mpich/include \
-		-I/home/sjplimp/tools/fftw/include -DFFT_FFTW -DGZIP
+CCFLAGS =	-g -O -DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK
 DEPFLAGS =	-M
 LINK =		g++
-LINKFLAGS =	-g -O -L/home/sjplimp/tools/mpich/lib \
-		-L/home/sjplimp/tools/fftw/lib
+LINKFLAGS =	-g -O
 USRLIB =	-lfftw -lmpich
-SYSLIB =
+SYSLIB =	-lpthread
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SIZE =		size
diff --git a/src/MAKE/Makefile.g++_meam b/src/MAKE/Makefile.g++_meam
index 5303e447cd..4af1a07812 100755
--- a/src/MAKE/Makefile.g++_meam
+++ b/src/MAKE/Makefile.g++_meam
@@ -6,16 +6,13 @@ SHELL = /bin/sh
 # System-specific settings
 
 CC =		g++
-CCFLAGS =	-g -O -I/home/sjplimp/tools/mpich/include \
-		-I/home/sjplimp/tools/fftw/include -DFFT_FFTW -DGZIP
+CCFLAGS =	-g -O -DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK
 DEPFLAGS =	-M
 LINK =		g++
-LINKFLAGS =	-g -O -L/home/sjplimp/tools/mpich/lib \
-		-L/home/sjplimp/tools/fftw/lib \
-		-L/home/sjplimp/lammps/lib/meam \
-		-L/opt/intel/fc/9.0/lib
+LINKFLAGS =	-g -O -L/home/sjplimp/lammps/lib/meam \
+		-L/opt/intel/fce/10.0.023/lib
 USRLIB =	-lfftw -lmpich -lmeam
-SYSLIB =	-lifcore
+SYSLIB =	-lpthread -lifcore -lsvml -lompstub -limf
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SIZE =		size
diff --git a/src/MAKE/Makefile.g++_poems b/src/MAKE/Makefile.g++_poems
index 1ab2bc3d11..e471d7f686 100755
--- a/src/MAKE/Makefile.g++_poems
+++ b/src/MAKE/Makefile.g++_poems
@@ -6,16 +6,13 @@ SHELL = /bin/sh
 # System-specific settings
 
 CC =		g++
-CCFLAGS =	-g -O -I/home/sjplimp/tools/mpich/include \
-		-I/home/sjplimp/lammps/lib/poems \
-		-I/home/sjplimp/tools/fftw/include -DFFT_FFTW -DGZIP
+CCFLAGS =	-g -O -I/home/sjplimp/lammps/lib/poems \
+		-DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK
 DEPFLAGS =	-M
 LINK =		g++
-LINKFLAGS =	-g -O -L/home/sjplimp/tools/mpich/lib \
-		-L/home/sjplimp/lammps/lib/poems \
-		-L/home/sjplimp/tools/fftw/lib
+LINKFLAGS =	-g -O -L/home/sjplimp/lammps/lib/poems
 USRLIB =	-lfftw -lmpich -lpoems
-SYSLIB =
+SYSLIB =	-lpthread
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SIZE =		size
diff --git a/src/MAKE/Makefile.linux b/src/MAKE/Makefile.linux
index c164a65780..3bede812f3 100755
--- a/src/MAKE/Makefile.linux
+++ b/src/MAKE/Makefile.linux
@@ -1,4 +1,4 @@
-# linux = RedHat Linux box, Intel icc, MPICH, FFTW
+# linux = RedHat Linux box, Intel icc, MPICH2, FFTW
 
 SHELL = /bin/sh
 #.IGNORE:
@@ -6,14 +6,12 @@ SHELL = /bin/sh
 # System-specific settings
 
 CC =		icc
-CCFLAGS =	-O -I/home/sjplimp/tools/mpich/include \
-		-I/home/sjplimp/tools/fftw/include -DFFT_FFTW -DGZIP
+CCFLAGS =	-O -DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK
 DEPFLAGS =	-M
 LINK =		icc
-LINKFLAGS =	-O -L/home/sjplimp/tools/mpich/lib \
-		-L/home/sjplimp/tools/fftw/lib
+LINKFLAGS =	-O
 USRLIB =	-lfftw -lmpich
-SYSLIB =	-lcxa -lunwind -lstdc++
+SYSLIB =	-lpthread -lstdc++
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SIZE =		size
diff --git a/src/MAKE/Makefile.linux_poems_meam b/src/MAKE/Makefile.linux_poems_meam
index a362b464c8..bd3c06db96 100755
--- a/src/MAKE/Makefile.linux_poems_meam
+++ b/src/MAKE/Makefile.linux_poems_meam
@@ -6,18 +6,15 @@ SHELL = /bin/sh
 # System-specific settings
 
 CC =		icc
-CCFLAGS =	-O -I/home/sjplimp/tools/mpich/include \
-		-I/home/sjplimp/lammps/lib/poems \
-		-I/home/sjplimp/tools/fftw/include -DFFT_FFTW -DGZIP
+CCFLAGS =	-O -I/home/sjplimp/lammps/lib/poems \
+		-DFFT_FFTW -DGZIP -DMPICH_IGNORE_CXX_SEEK
 DEPFLAGS =	-M
 LINK =		icc
-LINKFLAGS =	-O -L/home/sjplimp/tools/mpich/lib \
-		-L/home/sjplimp/lammps/lib/poems \
+LINKFLAGS =	-O -L/home/sjplimp/lammps/lib/poems \
 		-L/home/sjplimp/lammps/lib/meam \
-		-L/home/sjplimp/tools/fftw/lib \
-		-L/opt/intel/fc/9.0/lib
+		-L/opt/intel/fce/10.0.023/lib
 USRLIB =	-lfftw -lmpich -lpoems -lmeam
-SYSLIB =	-lstdc++ -lcxa -lunwind -lifcore
+SYSLIB =	-lpthread -lstdc++
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SIZE =		size
diff --git a/src/MAKE/Makefile.serial b/src/MAKE/Makefile.serial
index 689675cf8f..21fab20cf9 100755
--- a/src/MAKE/Makefile.serial
+++ b/src/MAKE/Makefile.serial
@@ -1,16 +1,16 @@
-# serial = RedHat Linux box, g++, no MPI, no FFTs
+# serial = RedHat Linux box, icc, no MPI, no FFTs
 
 SHELL = /bin/sh
 
 # System-specific settings
 
-CC =		g++
+CC =		icc
 CCFLAGS =	-O -I../STUBS -DFFT_NONE
 DEPFLAGS =	-M
-LINK =		g++
+LINK =		icc
 LINKFLAGS =	-O -L../STUBS
 USRLIB =	-lmpi
-SYSLIB = 
+SYSLIB =	-lstdc++
 ARCHIVE =	ar
 ARFLAGS =	-rc
 SIZE =		size