diff --git a/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt b/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt
index 0403e2bb3..92cb6e2e3 100644
--- a/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt
+++ b/sorc/emcsfc_snow2mdl.fd/CMakeLists.txt
@@ -4,17 +4,17 @@
 # George Gayno, Mark Potts
 
 set(fortran_src
-    driver.f
-    grib_utils.f
-    model_grid.f
-    program_setup.f
-    snow2mdl.f
-    snowdat.f)
+    driver.F90
+    grib_utils.F90
+    model_grid.F90
+    program_setup.F90
+    snow2mdl.F90
+    snowdat.F90)
 
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -FR -convert big_endian -assume byterecl")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8 -convert big_endian -assume byterecl")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-form -fdefault-real-8 -fconvert=big-endian")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fconvert=big-endian")
 endif()
 
 set(exe_name emcsfc_snow2mdl)
diff --git a/sorc/emcsfc_snow2mdl.fd/driver.f b/sorc/emcsfc_snow2mdl.fd/driver.F90
similarity index 100%
rename from sorc/emcsfc_snow2mdl.fd/driver.f
rename to sorc/emcsfc_snow2mdl.fd/driver.F90
diff --git a/sorc/emcsfc_snow2mdl.fd/grib_utils.f b/sorc/emcsfc_snow2mdl.fd/grib_utils.F90
similarity index 100%
rename from sorc/emcsfc_snow2mdl.fd/grib_utils.f
rename to sorc/emcsfc_snow2mdl.fd/grib_utils.F90
diff --git a/sorc/emcsfc_snow2mdl.fd/model_grid.f b/sorc/emcsfc_snow2mdl.fd/model_grid.F90
similarity index 100%
rename from sorc/emcsfc_snow2mdl.fd/model_grid.f
rename to sorc/emcsfc_snow2mdl.fd/model_grid.F90
diff --git a/sorc/emcsfc_snow2mdl.fd/program_setup.f b/sorc/emcsfc_snow2mdl.fd/program_setup.F90
similarity index 100%
rename from sorc/emcsfc_snow2mdl.fd/program_setup.f
rename to sorc/emcsfc_snow2mdl.fd/program_setup.F90
diff --git a/sorc/emcsfc_snow2mdl.fd/snow2mdl.f b/sorc/emcsfc_snow2mdl.fd/snow2mdl.F90
similarity index 100%
rename from sorc/emcsfc_snow2mdl.fd/snow2mdl.f
rename to sorc/emcsfc_snow2mdl.fd/snow2mdl.F90
diff --git a/sorc/emcsfc_snow2mdl.fd/snowdat.f b/sorc/emcsfc_snow2mdl.fd/snowdat.F90
similarity index 100%
rename from sorc/emcsfc_snow2mdl.fd/snowdat.f
rename to sorc/emcsfc_snow2mdl.fd/snowdat.F90