diff --git a/Makefile.system b/Makefile.system
index 11cb5b3a0..2998c0e6a 100644
--- a/Makefile.system
+++ b/Makefile.system
@@ -850,6 +850,7 @@ ifneq ($(INTERFACE64), 0)
 FCOMMON_OPT += -i8
 endif
 endif
+FCOMMON_OPT += -recursive
 ifeq ($(USE_OPENMP), 1)
 FCOMMON_OPT += -fopenmp
 endif
@@ -893,6 +894,7 @@ FCOMMON_OPT += -tp p7-64
 else
 FCOMMON_OPT += -tp p7
 endif
+FCOMMON_OPT += -Mrecursive
 ifeq ($(USE_OPENMP), 1)
 FCOMMON_OPT += -mp
 endif
diff --git a/cmake/fc.cmake b/cmake/fc.cmake
index ff26ac06c..cc330ae2c 100644
--- a/cmake/fc.cmake
+++ b/cmake/fc.cmake
@@ -76,14 +76,12 @@ if (${F_COMPILER} STREQUAL "GFORTRAN")
   endif ()
 endif ()
 
-if (${F_COMPILER} STREQUAL "IFORT")
+if (${F_COMPILER} STREQUAL "INTEL")
   set(CCOMMON_OPT "${CCOMMON_OPT} -DF_INTERFACE_INTEL")
-  if (MSVC)
-    set(FCOMMON_OPT "${FCOMMON_OPT} -names:lowercase -assume:underscore")
-  endif ()  
   if (INTERFACE64)
     set(FCOMMON_OPT "${FCOMMON_OPT} -i8")
   endif ()
+  set(FCOMMON_OPT "${FCOMMON_OPT} -recursive")
   if (USE_OPENMP)
     set(FCOMMON_OPT "${FCOMMON_OPT} -openmp")
   endif ()
@@ -123,6 +121,7 @@ if (${F_COMPILER} STREQUAL "PGI")
   else ()
     set(FCOMMON_OPT "${FCOMMON_OPT} -tp p7")
   endif ()
+  set(FCOMMON_OPT "${FCOMMON_OPT} -Mrecursive")
   if (USE_OPENMP)
     set(FCOMMON_OPT "${FCOMMON_OPT} -mp")
   endif ()