diff --git a/src/MAKE/OPTIONS/Makefile.intel_cpu b/src/MAKE/OPTIONS/Makefile.intel_cpu
index f77205a5b5..0c2c6afe5d 100755
--- a/src/MAKE/OPTIONS/Makefile.intel_cpu
+++ b/src/MAKE/OPTIONS/Makefile.intel_cpu
@@ -7,14 +7,14 @@ SHELL = /bin/sh
 # specify flags and libraries needed for your compiler
 
 CC =		mpiicpc 
-OPTFLAGS =      -xHost -O2 -fp-model fast=2 -no-prec-div -override-limits
-CCFLAGS =	-g -openmp -DLAMMPS_MEMALIGN=64 -no-offload \
+OPTFLAGS =      -xHost -O2 -fp-model fast=2 -no-prec-div -qoverride-limits
+CCFLAGS =	-g -qopenmp -DLAMMPS_MEMALIGN=64 -no-offload \
                 -fno-alias -ansi-alias -restrict $(OPTFLAGS)
 SHFLAGS =	-fPIC
 DEPFLAGS =	-M
 
 LINK =		mpiicpc
-LINKFLAGS =	-g -openmp $(OPTFLAGS)
+LINKFLAGS =	-g -qopenmp $(OPTFLAGS)
 LIB =           -ltbbmalloc
 SIZE =		size
 
@@ -55,7 +55,7 @@ MPI_LIB =
 FFT_INC =       -DFFT_MKL -DFFT_SINGLE
 FFT_PATH = 
 FFT_LIB =       -L$MKLROOT/lib/intel64/ -lmkl_intel_ilp64 \
-                -lmkl_intel_thread -lmkl_core	
+                -lmkl_sequential -lmkl_core	
 
 # JPEG and/or PNG library
 # see discussion in Section 2.2 (step 7) of manual
diff --git a/src/MAKE/OPTIONS/Makefile.intel_phi b/src/MAKE/OPTIONS/Makefile.intel_phi
index 21831ae491..82ad2d30f0 100644
--- a/src/MAKE/OPTIONS/Makefile.intel_phi
+++ b/src/MAKE/OPTIONS/Makefile.intel_phi
@@ -7,16 +7,16 @@ SHELL = /bin/sh
 # specify flags and libraries needed for your compiler
 
 CC =		mpiicpc 
-MIC_OPT =       -offload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""
-CCFLAGS =	-g -O3 -openmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64 \
+MIC_OPT =       -qoffload-option,mic,compiler,"-fp-model fast=2 -mGLOB_default_function_attrs=\"gather_scatter_loop_unroll=4\""
+CCFLAGS =	-g -O3 -qopenmp -DLMP_INTEL_OFFLOAD -DLAMMPS_MEMALIGN=64 \
                 -xHost -fno-alias -ansi-alias -restrict \
-                -override-limits $(MIC_OPT)
+                -qoverride-limits $(MIC_OPT)
 SHFLAGS =	-fPIC
 DEPFLAGS =	-M
 
 LINK =		mpiicpc
-LINKFLAGS =	-g -O3 -xHost -openmp -offload
-LIB =           
+LINKFLAGS =	-g -O3 -xHost -qopenmp -qoffload
+LIB =           -ltbbmalloc
 SIZE =		size
 
 ARCHIVE =	ar
@@ -55,7 +55,7 @@ MPI_LIB =
 
 FFT_INC =      -DFFT_MKL -DFFT_SINGLE
 FFT_PATH = 
-FFT_LIB =	-L$(MKLROOT)/lib/intel64/ -lmkl_intel_ilp64 -lmkl_intel_thread -lmkl_core
+FFT_LIB =	-L$(MKLROOT)/lib/intel64/ -lmkl_intel_ilp64 -lmkl_sequential -lmkl_core
 
 # JPEG and/or PNG library
 # see discussion in Section 2.2 (step 7) of manual
diff --git a/src/MAKE/OPTIONS/Makefile.knl b/src/MAKE/OPTIONS/Makefile.knl
index 2778e84cd4..1260a27a12 100755
--- a/src/MAKE/OPTIONS/Makefile.knl
+++ b/src/MAKE/OPTIONS/Makefile.knl
@@ -7,14 +7,14 @@ SHELL = /bin/sh
 # specify flags and libraries needed for your compiler
 
 CC =		mpiicpc
-OPTFLAGS =      -xMIC-AVX512 -O2 -fp-model fast=2 -no-prec-div -override-limits
-CCFLAGS =	-g -openmp -DLAMMPS_MEMALIGN=64 -no-offload \
+OPTFLAGS =      -xMIC-AVX512 -O2 -fp-model fast=2 -no-prec-div -qoverride-limits
+CCFLAGS =	-g -qopenmp -DLAMMPS_MEMALIGN=64 -no-offload \
                 -fno-alias -ansi-alias -restrict $(OPTFLAGS)
 SHFLAGS =	-fPIC
 DEPFLAGS =	-M
 
 LINK =		mpiicpc
-LINKFLAGS =	-g -openmp $(OPTFLAGS) -static-intel
+LINKFLAGS =	-g -qopenmp $(OPTFLAGS)
 LIB =           -ltbbmalloc
 SIZE =		size
 
@@ -55,7 +55,7 @@ MPI_LIB =
 FFT_INC =       -DFFT_MKL -DFFT_SINGLE
 FFT_PATH = 
 FFT_LIB =       -L$MKLROOT/lib/intel64/ -lmkl_intel_ilp64 \
-                -lmkl_intel_thread -lmkl_core	
+                -lmkl_sequential -lmkl_core	
 
 # JPEG and/or PNG library
 # see discussion in Section 2.2 (step 7) of manual