diff --git a/configure b/configure
index 4323e75bd..6dfde2bcf 100755
--- a/configure
+++ b/configure
@@ -680,6 +680,7 @@ INSTALL_COMMAND
 MPI_LIBS
 MPI_OBJS
 LAM_MPI_CC
+INSTALL_MPI
 YAPMPILIB
 IN_UNIX
 LIBJPL
@@ -735,13 +736,13 @@ CPLINT_SHLIB_LD
 CPLINT_LDFLAGS
 CPLINT_CFLAGS
 CPLINT_LIBS
+MPI_CC
 ENABLE_PRISM
 ENABLE_GECODE
 NVCC
 PYTHON
 REXE
 INSTALL_INFO
-MPI_CC
 AR
 RANLIB
 INSTALL_DATA
@@ -4887,6 +4888,7 @@ if test "${with_mpi+set}" = set; then :
         		yap_cv_lam=yes
 	elif test "$withval" = no; then
 		yap_cv_lam=no
+		yap_cv_mpi=no
 	else
 		yap_cv_lam=$with_mpi
 		LDFLAGS="$LDFLAGS -L${yap_cv_mpi}/lib"
@@ -5201,7 +5203,9 @@ then
        C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
        CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
        case "`$CC --version < /dev/null`" in
-	  *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
+	  *3.4*)
+	    CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS"
+	  ;;
        esac
        case "$target_cpu" in
         i*86*)
@@ -5567,98 +5571,6 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mpicc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mpicc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MPI_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MPI_CC"; then
-  ac_cv_prog_MPI_CC="$MPI_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_MPI_CC="${ac_tool_prefix}mpicc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MPI_CC=$ac_cv_prog_MPI_CC
-if test -n "$MPI_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPI_CC" >&5
-$as_echo "$MPI_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MPI_CC"; then
-  ac_ct_MPI_CC=$MPI_CC
-  # Extract the first word of "mpicc", so it can be a program name with args.
-set dummy mpicc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MPI_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MPI_CC"; then
-  ac_cv_prog_ac_ct_MPI_CC="$ac_ct_MPI_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_MPI_CC="mpicc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MPI_CC=$ac_cv_prog_ac_ct_MPI_CC
-if test -n "$ac_ct_MPI_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MPI_CC" >&5
-$as_echo "$ac_ct_MPI_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MPI_CC" = x; then
-    MPI_CC="${CC}"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MPI_CC=$ac_ct_MPI_CC
-  fi
-else
-  MPI_CC="$ac_cv_prog_MPI_CC"
-fi
-
 # Extract the first word of "install-info", so it can be a program name with args.
 set dummy install-info; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -8519,6 +8431,12 @@ fi
 	;;
 esac
 
+if test "$CC" = icc
+then
+  MPI_CC="$CC -lirc"
+  yap_cv_lam=no
+fi
+
 if test "$dynamic_loading" = "yes"
 then
   YAPLIB_CFLAGS="$SHLIB_CFLAGS"
@@ -8636,8 +8554,101 @@ fi
 
 LAMOBJS=""
 MPI_OBJS=
-LAM_MPI_CC=${MPI_CC}
 if  test "$yap_cv_lam" != "no" ; then
+  INSTALL_MPI=""
+  LAM_MPI_CC=${MPI_CC}
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mpicc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mpicc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MPI_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MPI_CC"; then
+  ac_cv_prog_MPI_CC="$MPI_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MPI_CC="${ac_tool_prefix}mpicc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MPI_CC=$ac_cv_prog_MPI_CC
+if test -n "$MPI_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MPI_CC" >&5
+$as_echo "$MPI_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MPI_CC"; then
+  ac_ct_MPI_CC=$MPI_CC
+  # Extract the first word of "mpicc", so it can be a program name with args.
+set dummy mpicc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MPI_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MPI_CC"; then
+  ac_cv_prog_ac_ct_MPI_CC="$ac_ct_MPI_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MPI_CC="mpicc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MPI_CC=$ac_cv_prog_ac_ct_MPI_CC
+if test -n "$ac_ct_MPI_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MPI_CC" >&5
+$as_echo "$ac_ct_MPI_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MPI_CC" = x; then
+    MPI_CC="${CC}"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MPI_CC=$ac_ct_MPI_CC
+  fi
+else
+  MPI_CC="$ac_cv_prog_MPI_CC"
+fi
+
   if test "$yap_cv_lam" != "yes" ; then
     LAM_MPI_CC="$yap_cv_lam"/bin/mpicc
     MPI_CC="$yap_cv_lam"/bin/mpicc
@@ -8660,6 +8671,7 @@ fi
 
   CC=${OLD_CC}
   elif test "$yap_cv_mpi" != "no"; then
+    INSTALL_MPI=""
     OLD_CC=${CC}
     CC=${MPI_CC}
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPI_Init in -lmpi" >&5
@@ -8848,7 +8860,8 @@ done
      CC=${OLD_CC}
    fi
 else
-    MPI_CC=${CC}
+  INSTALL_MPI="# "
+  MPI_CC=${CC}
 fi
 
 
@@ -9815,6 +9828,7 @@ CMDEXT=sh
 
 
 
+
 
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc threaded code" >&5
@@ -10289,7 +10303,7 @@ _ACEOF
 fi
 done
 
-for ac_func in gethrtime getpagesize
+for ac_func in gethrtime getpagesize getpid
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
diff --git a/configure.in b/configure.in
index 1c2650a39..a97ac4c03 100755
--- a/configure.in
+++ b/configure.in
@@ -379,6 +379,7 @@ AC_ARG_WITH(mpi,
 		yap_cv_lam=yes
 	elif test "$withval" = no; then
 		yap_cv_lam=no
+		yap_cv_mpi=no
 	else
 		yap_cv_lam=$with_mpi
 		LDFLAGS="$LDFLAGS -L${yap_cv_mpi}/lib"
@@ -612,7 +613,9 @@ then
        C_PARSER_FLAGS="-O3 -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
        CFLAGS="-O3 -fomit-frame-pointer -Wall -Wstrict-prototypes -Wmissing-prototypes $CFLAGS"
        case "`$CC --version < /dev/null`" in	
-	  *3.4*) CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" ;;
+	  *3.4*) 
+	    CFLAGS="-fno-gcse -fno-crossjumping $CFLAGS" 
+	  ;;
        esac
        case "$target_cpu" in
         i*86*)
@@ -697,7 +700,6 @@ AC_PROG_LN_S
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 AC_CHECK_TOOL(AR,ar,:)
-AC_CHECK_TOOL(MPI_CC,mpicc,${CC})
 AC_PATH_PROG(INSTALL_INFO,install-info,true,$PATH:/sbin:/usr/sbin:/usr/etc:/usr/local/sbin)
 AC_PATH_PROG(SHELL,sh)
 
@@ -1529,6 +1531,12 @@ dnl Linux has both elf and a.out, in this case we found elf
 	;;
 esac
 
+if test "$CC" = icc
+then
+  MPI_CC="$CC -lirc"
+  yap_cv_lam=no
+fi
+
 if test "$dynamic_loading" = "yes"
 then 
   YAPLIB_CFLAGS="$SHLIB_CFLAGS"
@@ -1641,8 +1649,10 @@ dnl LAM/MPI interface
 
 LAMOBJS=""
 MPI_OBJS=
-LAM_MPI_CC=${MPI_CC}
 if  test "$yap_cv_lam" != "no" ; then	
+  INSTALL_MPI=""
+  LAM_MPI_CC=${MPI_CC}
+  AC_CHECK_TOOL(MPI_CC,mpicc,${CC})
   if test "$yap_cv_lam" != "yes" ; then
     LAM_MPI_CC="$yap_cv_lam"/bin/mpicc
     MPI_CC="$yap_cv_lam"/bin/mpicc
@@ -1659,6 +1669,7 @@ if  test "$yap_cv_lam" != "no" ; then
   CC=${OLD_CC}
   dnl use mpich library
 elif test "$yap_cv_mpi" != "no"; then
+    INSTALL_MPI=""
     OLD_CC=${CC}
     CC=${MPI_CC}
     AC_CHECK_LIB(mpi,MPI_Init,
@@ -1702,7 +1713,8 @@ elif test "$yap_cv_mpi" != "no"; then
      CC=${OLD_CC}
    fi
 else
-    MPI_CC=${CC}
+  INSTALL_MPI="# "
+  MPI_CC=${CC}
 fi
 
 
@@ -1906,6 +1918,7 @@ AC_SUBST(JAR)
 AC_SUBST(LIBJPL)
 AC_SUBST(IN_UNIX)
 AC_SUBST(YAPMPILIB)
+AC_SUBST(INSTALL_MPI)
 AC_SUBST(LAM_MPI_CC)
 AC_SUBST(MPI_OBJS)
 AC_SUBST(MPI_LIBS)
@@ -2122,7 +2135,7 @@ AC_CHECK_FUNCS(erf feclearexcept)
 AC_CHECK_FUNCS(fesettrapenable fgetpos finite fpclass ftime ftruncate getcwd getenv)
 AC_CHECK_FUNCS(getexecname)
 AC_CHECK_FUNCS(gethostbyname gethostent gethostid gethostname)
-AC_CHECK_FUNCS(gethrtime getpagesize)
+AC_CHECK_FUNCS(gethrtime getpagesize getpid)
 AC_CHECK_FUNCS(getpwnam getrlimit getrusage gettimeofday getwd)
 AC_CHECK_FUNCS(isatty isnan isinf kill labs link lgamma)
 AC_CHECK_FUNCS(localtime lstat mallinfo)