diff --git a/config/cesm/machines/Depends.intel b/config/cesm/machines/Depends.intel
index 5369c3f714f..3dd4e885e27 100644
--- a/config/cesm/machines/Depends.intel
+++ b/config/cesm/machines/Depends.intel
@@ -34,7 +34,7 @@ ifeq ($(DEBUG),FALSE)
   $(REDUCED_PRECISION_OBJS): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -fimf-precision=low -fp-model fast $<
   $(SHR_RANDNUM_FORT_OBJS): %.o: %.F90
-	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -fp-model fast -no-prec-div -no-prec-sqrt -override-limits $<
+	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -fp-model fast -no-prec-div -no-prec-sqrt -qoverride-limits $<
   $(SHR_RANDNUM_C_OBJS): %.o: %.c
 	  $(CC) -c $(INCLDIR) $(INCS) $(CFLAGS) -O3 -fp-model fast $<
 endif
diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
index 8fcae15b6ac..4a20e77b62b 100644
--- a/config/cesm/machines/config_machines.xml
+++ b/config/cesm/machines/config_machines.xml
@@ -507,7 +507,7 @@
 
       <modules compiler="intel">
 	<command name="load">PrgEnv-intel</command>
-	<command name="switch">intel intel/17.0.1.132</command>
+	<command name="switch">intel intel/18.0.1.163</command>
 	<command name="use">/global/project/projectdirs/ccsm1/modulefiles/cori</command>
       </modules>
       <modules compiler="intel" mpilib="!mpi-serial" >
@@ -519,34 +519,34 @@
 
       <modules compiler="cray">
 	<command name="load">PrgEnv-cray</command>
-	<command name="switch">cce cce/8.5.7</command>
+	<command name="switch">cce cce/8.6.2</command>
       </modules>
       <modules compiler="gnu">
 	<command name="load">PrgEnv-gnu</command>
-	<command name="switch">gcc gcc/6.2.0</command>
+	<command name="switch">gcc gcc/7.1.0</command>
       </modules>
       <modules>
 	<command name="load">cray-memkind</command>
-	<command name="load">papi/5.4.1.3</command>
-	<command name="swap">craype craype/2.5.7</command>
+	<command name="load">papi/5.5.1.3</command>
+	<command name="swap">craype craype/2.5.12.3</command>
       </modules>
       <modules>
-	<command name="switch">cray-libsci/16.09.1</command>
+	<command name="switch">cray-libsci/17.09.1</command>
       </modules>
       <modules>
-	<command name="load">cray-mpich/7.4.4</command>
+	<command name="load">cray-mpich/7.6.2</command>
       </modules>
       <modules mpilib="mpi-serial">
-	<command name="load">cray-hdf5/1.10.0</command>
-	<command name="load">cray-netcdf/4.4.1</command>
+	<command name="load">cray-hdf5/1.10.0.3</command>
+	<command name="load">cray-netcdf/4.4.1.1.3</command>
       </modules>
       <modules mpilib="!mpi-serial">
-	<command name="load">cray-netcdf-hdf5parallel/4.3.3.1</command>
-	<command name="load">cray-hdf5-parallel/1.8.16</command>
-	<command name="load">cray-parallel-netcdf/1.7.0</command>
+	<command name="load">cray-netcdf-hdf5parallel/4.4.1.1.3</command>
+	<command name="load">cray-hdf5-parallel/1.10.0.3</command>
+	<command name="load">cray-parallel-netcdf/1.8.1.3</command>
       </modules>
       <modules>
-	<command name="load">cmake/3.5.2</command>
+	<command name="load">cmake/3.8.2</command>
       </modules>
     </module_system>
     <environment_variables>
@@ -610,7 +610,7 @@
       </modules>
       <modules compiler="intel">
 	<command name="load">PrgEnv-intel</command>
-	<command name="switch">intel intel/17.0.3.191</command>
+	<command name="switch">intel intel/18.0.1.163</command>
 	<command name="use">/global/project/projectdirs/ccsm1/modulefiles/cori</command>
       </modules>
       <modules compiler="intel" mpilib="!mpi-serial" >
@@ -622,34 +622,34 @@
 
       <modules compiler="cray">
 	<command name="load">PrgEnv-cray</command>
-	<command name="switch">cce cce/8.5.8</command>
+	<command name="switch">cce cce/8.6.2</command>
       </modules>
       <modules compiler="gnu">
 	<command name="load">PrgEnv-gnu</command>
-	<command name="switch">gcc gcc/6.2.0</command>
+	<command name="switch">gcc gcc/7.1.0</command>
       </modules>
       <modules>
 	<command name="load">cray-memkind</command>
 	<command name="load">craype-mic-knl</command>
-	<command name="swap">craype craype/2.5.7</command>
+	<command name="swap">craype craype/2.5.12.3</command>
       </modules>
       <modules>
-	<command name="switch">cray-libsci/16.11.1</command>
+	<command name="switch">cray-libsci/17.09.1</command>
       </modules>
       <modules>
-	<command name="load">cray-mpich/7.4.4</command>
+	<command name="load">cray-mpich/7.6.2</command>
       </modules>
       <modules mpilib="mpi-serial">
-	<command name="load">cray-hdf5/1.10.0</command>
-	<command name="load">cray-netcdf/4.4.1</command>
+	<command name="load">cray-hdf5/1.10.0.3</command>
+	<command name="load">cray-netcdf/4.4.1.1.3</command>
       </modules>
       <modules mpilib="!mpi-serial">
-	<command name="load">cray-netcdf-hdf5parallel/4.3.3.1</command>
-	<command name="load">cray-hdf5-parallel/1.8.16</command>
-	<command name="load">cray-parallel-netcdf/1.7.0</command>
+	<command name="load">cray-netcdf-hdf5parallel/4.4.1.1.3</command>
+	<command name="load">cray-hdf5-parallel/1.10.0.3</command>
+	<command name="load">cray-parallel-netcdf/1.8.1.3</command>
       </modules>
       <modules>
-	<command name="load">cmake/3.5.2</command>
+	<command name="load">cmake/3.8.2</command>
       </modules>
     </module_system>
     <environment_variables>
@@ -769,7 +769,7 @@
 
       <modules compiler="intel">
 	<command name="load">PrgEnv-intel</command>
-	<command name="switch">intel intel/16.0.3.210</command>
+	<command name="switch">intel intel/18.0.1.163</command>
 	<command name="rm">cray-libsci</command>
 	<command name="use">/global/project/projectdirs/ccsm1/modulefiles/edison</command>
       </modules>
@@ -781,30 +781,30 @@
       </modules>
       <modules compiler="cray">
 	<command name="load">PrgEnv-cray</command>
-	<command name="switch">cce cce/8.5.1</command>
-	<command name="switch">cray-libsci/16.07.1</command>
+	<command name="switch">cce cce/8.6.2</command>
+	<command name="switch">cray-libsci/17.09.1</command>
       </modules>
       <modules compiler="gnu">
 	<command name="load">PrgEnv-gnu</command>
-	<command name="switch">gcc gcc/6.1.0</command>
-	<command name="switch">cray-libsci/16.07.1</command>
+	<command name="switch">gcc gcc/7.1.0</command>
+	<command name="switch">cray-libsci/17.09.1</command>
       </modules>
       <modules>
-	<command name="load">papi/5.4.3.2</command>
-	<command name="swap">craype craype/2.5.5</command>
+	<command name="load">papi/5.5.1.3</command>
+	<command name="swap">craype craype/2.5.12.3</command>
 	<command name="load">craype-ivybridge</command>
       </modules>
       <modules>
-	<command name="load">cray-mpich/7.6.0</command>
+	<command name="load">cray-mpich/7.6.2</command>
       </modules>
       <modules mpilib="mpi-serial">
-	<command name="load">cray-hdf5/1.8.16</command>
-	<command name="load">cray-netcdf/4.4.0</command>
+	<command name="load">cray-hdf5/1.10.0.3</command>
+	<command name="load">cray-netcdf/4.4.1.1.3</command>
       </modules>
       <modules mpilib="!mpi-serial">
-	<command name="load">cray-netcdf-hdf5parallel/4.4.0</command>
-	<command name="load">cray-hdf5-parallel/1.8.16</command>
-	<command name="load">cray-parallel-netcdf/1.7.0</command>
+	<command name="load">cray-netcdf-hdf5parallel/4.4.1.1.3</command>
+	<command name="load">cray-hdf5-parallel/1.10.0.3</command>
+	<command name="load">cray-parallel-netcdf/1.8.1.3</command>
       </modules>
     </module_system>