diff --git a/modulefiles/chgres_cube.cheyenne b/modulefiles/chgres_cube.cheyenne
new file mode 100644
index 000000000..a4006d681
--- /dev/null
+++ b/modulefiles/chgres_cube.cheyenne
@@ -0,0 +1,40 @@
+#%Module#####################################################
+## Build module for Cheyenne
+#############################################################
+module load ncarenv/1.3
+module load intel/19.0.2
+module load ncarcompilers/0.5.0
+module load impi/2019.2.187
+module load netcdf/4.6.3
+
+module use -a /glade/p/ral/jntp/GMTB/tools/modulefiles/intel-19.0.2/impi-2019.2.187
+
+##
+## use pre-compiled EMSF library for above compiler / MPI combination
+##
+module load esmf/8.0.0_bs50
+
+NCEPLIB_PATH=/glade/p/ral/jntp/GMTB/tools/NCEPlibs/20190703/intel-19.0.2/impi-2019.2.187/lib
+NCEPINC_PATH=/glade/p/ral/jntp/GMTB/tools/NCEPlibs/20190703/intel-19.0.2/impi-2019.2.187/include
+
+export NEMSIO_LIB="${NCEPLIB_PATH}/libnemsio_d.a"
+export W3NCO_LIBd="${NCEPLIB_PATH}/libw3nco_d.a"
+export BACIO_LIB4="${NCEPLIB_PATH}/libbacio_4.a"
+export SP_LIBd="${NCEPLIB_PATH}/libsp_v2.0.2_d.a"
+export SIGIO_LIB4="${NCEPLIB_PATH}/libsigio_v2.0.1_4.a"
+export SFCIO_LIB4="${NCEPLIB_PATH}/libsfcio_v1.0.0_4.a"
+
+export NEMSIO_INC="${NCEPINC_PATH}"
+export SFCIO_INC4="${NCEPINC_PATH}"
+export SIGIO_INC4="${NCEPINC_PATH}"
+
+export FCOMP=mpiifort
+#export FFLAGS="-O3 -fp-model precise -g -traceback -r8 -i4 -qopenmp -convert big_endian -assume byterecl"
+# for debugging
+export FFLAGS="-O0 -g -traceback -r8 -i4 -qopenmp -convert big_endian -check bounds -warn unused -assume byterecl"
+
+WGRIB2_PATH=/glade/u/apps/ch/opt/wgrib2/0.2.0.8/intel/18.0.5/lib
+
+export WGRIB2API_LIB="${WGRIB2_PATH}/libwgrib2_api.a"
+export WGRIB2API_INC="${WGRIB2_PATH}"
+export WGRIB2_LIB="${WGRIB2_PATH}/libwgrib2.a"
diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh
index 77f5bbb3b..6a7a281f0 100644
--- a/sorc/machine-setup.sh
+++ b/sorc/machine-setup.sh
@@ -89,12 +89,12 @@ elif [[ -d /dcom && -d /hwrf ]] ; then
     target=wcoss
     module purge
 elif [[ -d /glade ]] ; then
-    # We are on NCAR Yellowstone
+    # We are on NCAR Cheyenne
     if ( ! eval module help > /dev/null 2>&1 ) ; then
 	echo load the module command 1>&2
         . /usr/share/Modules/init/$__ms_shell
     fi
-    target=yellowstone
+    target=cheyenne
     module purge
 elif [[ -d /lustre && -d /ncrc ]] ; then
     # We are on GAEA.