diff --git a/etc/bashrc b/etc/bashrc
index cad3ed3774..2fd7b92aa6 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -63,9 +63,10 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
 : ${WM_OS:=Unix}; export WM_OS
 
 
-# Compiler (if set to "" use the system compiler)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 export WM_COMPILER=Gcc43
+
 export WM_COMPILER_ARCH=
 export WM_COMPILER_LIB_ARCH=
 
@@ -105,13 +106,11 @@ Linux)
     # compiler specifics
     case `uname -m` in
     i686)
-        # export WM_COMPILER=I32
         ;;
 
     x86_64)
         case $WM_ARCH_OPTION in
         32)
-            # export WM_COMPILER=I64
             export WM_COMPILER_ARCH='-64'
             export WM_CC='gcc'
             export WM_CXX='g++'
@@ -122,7 +121,6 @@ Linux)
         64)
             WM_ARCH=linux64
             export WM_COMPILER_LIB_ARCH=64
-            # export WM_COMPILER=I64
             export WM_CC='gcc'
             export WM_CXX='g++'
             export WM_CFLAGS='-m64 -fPIC'
@@ -144,17 +142,6 @@ Linux)
     esac
     ;;
 
-SunOS)
-    WM_ARCH=solaris
-    ;;
-
-IRIX*)
-    WM_ARCH=sgiN32
-    # export WM_ARCH=sgi64
-    # export WM_COMPILER_LIB_ARCH=/mabi=64
-    export WM_MPLIB=MPI
-    ;;
-
 *)    	# an unsupported operating system
     cat <<USAGE
 
diff --git a/etc/cshrc b/etc/cshrc
index 203466dd7d..5492cc8c96 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -55,9 +55,10 @@ setenv WM_PROJECT_DIR $FOAM_INST_DIR/$WM_PROJECT-$WM_PROJECT_VERSION
 setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
 
 
-# Compiler (if set to "" use the system compiler)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-setenv WM_COMPILER Gcc
+# Compiler: set to Gcc, Gcc43 or Icc (for Intel's icc)
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+setenv WM_COMPILER Gcc43
+
 setenv WM_COMPILER_ARCH
 setenv WM_COMPILER_LIB_ARCH
 
@@ -102,13 +103,11 @@ case Linux:
 
     switch (`uname -m`)
     case i686:
-        #setenv WM_COMPILER I32
         breaksw
     case x86_64:
         switch ($WM_ARCH_OPTION)
         case 32:
             setenv WM_ARCH linux
-            #setenv WM_COMPILER I32
             setenv WM_COMPILER_ARCH '-64'
             setenv WM_CC 'gcc'
             setenv WM_CXX 'g++'
@@ -140,17 +139,6 @@ case Linux:
     endsw
     breaksw
 
-case SunOS:
-    setenv WM_ARCH solaris
-    breaksw
-
-case IRIX*:
-    setenv WM_ARCH sgiN32
-    # setenv WM_ARCH sgi64
-    # setenv WM_COMPILER_LIB_ARCH /mabi=64
-    setenv WM_MPLIB MPI
-    breaksw
-
 default:
     echo
     echo "Your '$WM_ARCH' operating system is not supported by this release"
diff --git a/wmake/rules/linux64I64/X b/wmake/rules/linux64Icc/X
similarity index 100%
rename from wmake/rules/linux64I64/X
rename to wmake/rules/linux64Icc/X
diff --git a/wmake/rules/linux64I64/c b/wmake/rules/linux64Icc/c
similarity index 100%
rename from wmake/rules/linux64I64/c
rename to wmake/rules/linux64Icc/c
diff --git a/wmake/rules/linux64I64/c++ b/wmake/rules/linux64Icc/c++
similarity index 100%
rename from wmake/rules/linux64I64/c++
rename to wmake/rules/linux64Icc/c++
diff --git a/wmake/rules/linux64I64/c++Debug b/wmake/rules/linux64Icc/c++Debug
similarity index 100%
rename from wmake/rules/linux64I64/c++Debug
rename to wmake/rules/linux64Icc/c++Debug
diff --git a/wmake/rules/linux64I64/c++Opt b/wmake/rules/linux64Icc/c++Opt
similarity index 100%
rename from wmake/rules/linux64I64/c++Opt
rename to wmake/rules/linux64Icc/c++Opt
diff --git a/wmake/rules/linux64I64/c++Prof b/wmake/rules/linux64Icc/c++Prof
similarity index 100%
rename from wmake/rules/linux64I64/c++Prof
rename to wmake/rules/linux64Icc/c++Prof
diff --git a/wmake/rules/linux64I64/cDebug b/wmake/rules/linux64Icc/cDebug
similarity index 100%
rename from wmake/rules/linux64I64/cDebug
rename to wmake/rules/linux64Icc/cDebug
diff --git a/wmake/rules/linux64I64/cOpt b/wmake/rules/linux64Icc/cOpt
similarity index 100%
rename from wmake/rules/linux64I64/cOpt
rename to wmake/rules/linux64Icc/cOpt
diff --git a/wmake/rules/linux64I64/cProf b/wmake/rules/linux64Icc/cProf
similarity index 100%
rename from wmake/rules/linux64I64/cProf
rename to wmake/rules/linux64Icc/cProf
diff --git a/wmake/rules/linux64I64/dirToString b/wmake/rules/linux64Icc/dirToString
similarity index 100%
rename from wmake/rules/linux64I64/dirToString
rename to wmake/rules/linux64Icc/dirToString
diff --git a/wmake/rules/linux64I64/general b/wmake/rules/linux64Icc/general
similarity index 100%
rename from wmake/rules/linux64I64/general
rename to wmake/rules/linux64Icc/general
diff --git a/wmake/rules/linux64I64/mplib b/wmake/rules/linux64Icc/mplib
similarity index 100%
rename from wmake/rules/linux64I64/mplib
rename to wmake/rules/linux64Icc/mplib
diff --git a/wmake/rules/linux64I64/mplibLAM b/wmake/rules/linux64Icc/mplibLAM
similarity index 100%
rename from wmake/rules/linux64I64/mplibLAM
rename to wmake/rules/linux64Icc/mplibLAM
diff --git a/wmake/rules/linux64I64/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH
similarity index 100%
rename from wmake/rules/linux64I64/mplibMPICH
rename to wmake/rules/linux64Icc/mplibMPICH
diff --git a/wmake/rules/linux64I64/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI
similarity index 100%
rename from wmake/rules/linux64I64/mplibOPENMPI
rename to wmake/rules/linux64Icc/mplibOPENMPI
diff --git a/wmake/rules/linux64I64/wmkdep b/wmake/rules/linux64Icc/wmkdep
similarity index 100%
rename from wmake/rules/linux64I64/wmkdep
rename to wmake/rules/linux64Icc/wmkdep
diff --git a/wmake/rules/linuxI32/X b/wmake/rules/linuxIA64Icc/X
similarity index 100%
rename from wmake/rules/linuxI32/X
rename to wmake/rules/linuxIA64Icc/X
diff --git a/wmake/rules/linuxIA64I64/c b/wmake/rules/linuxIA64Icc/c
similarity index 100%
rename from wmake/rules/linuxIA64I64/c
rename to wmake/rules/linuxIA64Icc/c
diff --git a/wmake/rules/linuxIA64I64/c++ b/wmake/rules/linuxIA64Icc/c++
similarity index 100%
rename from wmake/rules/linuxIA64I64/c++
rename to wmake/rules/linuxIA64Icc/c++
diff --git a/wmake/rules/linuxI32/c++Debug b/wmake/rules/linuxIA64Icc/c++Debug
similarity index 100%
rename from wmake/rules/linuxI32/c++Debug
rename to wmake/rules/linuxIA64Icc/c++Debug
diff --git a/wmake/rules/linuxIA64I64/c++Opt b/wmake/rules/linuxIA64Icc/c++Opt
similarity index 100%
rename from wmake/rules/linuxIA64I64/c++Opt
rename to wmake/rules/linuxIA64Icc/c++Opt
diff --git a/wmake/rules/linuxIA64I64/c++Prof b/wmake/rules/linuxIA64Icc/c++Prof
similarity index 100%
rename from wmake/rules/linuxIA64I64/c++Prof
rename to wmake/rules/linuxIA64Icc/c++Prof
diff --git a/wmake/rules/linuxI32/cDebug b/wmake/rules/linuxIA64Icc/cDebug
similarity index 100%
rename from wmake/rules/linuxI32/cDebug
rename to wmake/rules/linuxIA64Icc/cDebug
diff --git a/wmake/rules/linuxIA64I64/cOpt b/wmake/rules/linuxIA64Icc/cOpt
similarity index 100%
rename from wmake/rules/linuxIA64I64/cOpt
rename to wmake/rules/linuxIA64Icc/cOpt
diff --git a/wmake/rules/linuxI32/cProf b/wmake/rules/linuxIA64Icc/cProf
similarity index 100%
rename from wmake/rules/linuxI32/cProf
rename to wmake/rules/linuxIA64Icc/cProf
diff --git a/wmake/rules/linuxIA64I64/dirToString b/wmake/rules/linuxIA64Icc/dirToString
similarity index 100%
rename from wmake/rules/linuxIA64I64/dirToString
rename to wmake/rules/linuxIA64Icc/dirToString
diff --git a/wmake/rules/linuxIA64I64/general b/wmake/rules/linuxIA64Icc/general
similarity index 100%
rename from wmake/rules/linuxIA64I64/general
rename to wmake/rules/linuxIA64Icc/general
diff --git a/wmake/rules/linuxI32/mplib b/wmake/rules/linuxIA64Icc/mplib
similarity index 100%
rename from wmake/rules/linuxI32/mplib
rename to wmake/rules/linuxIA64Icc/mplib
diff --git a/wmake/rules/linuxIA64I64/mplibIMPI b/wmake/rules/linuxIA64Icc/mplibIMPI
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplibIMPI
rename to wmake/rules/linuxIA64Icc/mplibIMPI
diff --git a/wmake/rules/linuxI32/mplibLAM b/wmake/rules/linuxIA64Icc/mplibLAM
similarity index 100%
rename from wmake/rules/linuxI32/mplibLAM
rename to wmake/rules/linuxIA64Icc/mplibLAM
diff --git a/wmake/rules/linuxIA64I64/mplibMPI b/wmake/rules/linuxIA64Icc/mplibMPI
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplibMPI
rename to wmake/rules/linuxIA64Icc/mplibMPI
diff --git a/wmake/rules/linuxI32/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH
similarity index 100%
rename from wmake/rules/linuxI32/mplibMPICH
rename to wmake/rules/linuxIA64Icc/mplibMPICH
diff --git a/wmake/rules/linuxI32/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI
similarity index 100%
rename from wmake/rules/linuxI32/mplibOPENMPI
rename to wmake/rules/linuxIA64Icc/mplibOPENMPI
diff --git a/wmake/rules/linuxIA64I64/wmkdep b/wmake/rules/linuxIA64Icc/wmkdep
similarity index 100%
rename from wmake/rules/linuxIA64I64/wmkdep
rename to wmake/rules/linuxIA64Icc/wmkdep
diff --git a/wmake/rules/linuxIA64I64/X b/wmake/rules/linuxIcc/X
similarity index 100%
rename from wmake/rules/linuxIA64I64/X
rename to wmake/rules/linuxIcc/X
diff --git a/wmake/rules/linuxI32/c b/wmake/rules/linuxIcc/c
similarity index 100%
rename from wmake/rules/linuxI32/c
rename to wmake/rules/linuxIcc/c
diff --git a/wmake/rules/linuxI32/c++ b/wmake/rules/linuxIcc/c++
similarity index 100%
rename from wmake/rules/linuxI32/c++
rename to wmake/rules/linuxIcc/c++
diff --git a/wmake/rules/linuxIA64I64/c++Debug b/wmake/rules/linuxIcc/c++Debug
similarity index 100%
rename from wmake/rules/linuxIA64I64/c++Debug
rename to wmake/rules/linuxIcc/c++Debug
diff --git a/wmake/rules/linuxI32/c++Opt b/wmake/rules/linuxIcc/c++Opt
similarity index 100%
rename from wmake/rules/linuxI32/c++Opt
rename to wmake/rules/linuxIcc/c++Opt
diff --git a/wmake/rules/linuxI32/c++Prof b/wmake/rules/linuxIcc/c++Prof
similarity index 100%
rename from wmake/rules/linuxI32/c++Prof
rename to wmake/rules/linuxIcc/c++Prof
diff --git a/wmake/rules/linuxIA64I64/cDebug b/wmake/rules/linuxIcc/cDebug
similarity index 100%
rename from wmake/rules/linuxIA64I64/cDebug
rename to wmake/rules/linuxIcc/cDebug
diff --git a/wmake/rules/linuxI32/cOpt b/wmake/rules/linuxIcc/cOpt
similarity index 100%
rename from wmake/rules/linuxI32/cOpt
rename to wmake/rules/linuxIcc/cOpt
diff --git a/wmake/rules/linuxIA64I64/cProf b/wmake/rules/linuxIcc/cProf
similarity index 100%
rename from wmake/rules/linuxIA64I64/cProf
rename to wmake/rules/linuxIcc/cProf
diff --git a/wmake/rules/linuxI32/dirToString b/wmake/rules/linuxIcc/dirToString
similarity index 100%
rename from wmake/rules/linuxI32/dirToString
rename to wmake/rules/linuxIcc/dirToString
diff --git a/wmake/rules/linuxI32/general b/wmake/rules/linuxIcc/general
similarity index 100%
rename from wmake/rules/linuxI32/general
rename to wmake/rules/linuxIcc/general
diff --git a/wmake/rules/linuxIA64I64/mplib b/wmake/rules/linuxIcc/mplib
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplib
rename to wmake/rules/linuxIcc/mplib
diff --git a/wmake/rules/linuxIA64I64/mplibLAM b/wmake/rules/linuxIcc/mplibLAM
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplibLAM
rename to wmake/rules/linuxIcc/mplibLAM
diff --git a/wmake/rules/linuxIA64I64/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplibMPICH
rename to wmake/rules/linuxIcc/mplibMPICH
diff --git a/wmake/rules/linuxIA64I64/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI
similarity index 100%
rename from wmake/rules/linuxIA64I64/mplibOPENMPI
rename to wmake/rules/linuxIcc/mplibOPENMPI