diff --git a/configure b/configure
index b4e60422..7cc08ca2 100755
--- a/configure
+++ b/configure
@@ -2929,6 +2929,10 @@ if eval "$FC -qversion 2>&1 | grep XL 2>/dev/null" ; then
 	# Some configurations of the XLF want "-WF," prepended to -D.. flags.
 	# TODO : discover the exact conditions when the usage of -WF is needed.
 	mld_cv_define_prepend="-WF,"
+        if eval "$MPIFC -qversion 2>&1 | grep -e\"Version: 10\.\" 2>/dev/null"; then
+        	FDEFINES="$mld_cv_define_prepend-DXLF_10 $FDEFINES"
+        fi
+
  # Note : there coule be problems with old xlf compiler versions ( <10.1 )
  # since (as far as it is known to us) -WF, is not used in earlier versions.
  # More problems could be undocumented yet.
@@ -3946,7 +3950,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test "X$MPICC" = "X" ; then
     # This is our MPICC compiler preference: it will override ACX_MPI's first try.
-    for ac_prog in mpxlc mpcc pgcc mpicc
+    for ac_prog in mpxlc mpcc mpicc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
diff --git a/configure.ac b/configure.ac
index 68a398e2..bbf85878 100755
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,10 @@ if eval "$FC -qversion 2>&1 | grep XL 2>/dev/null" ; then
 	# Some configurations of the XLF want "-WF," prepended to -D.. flags.
 	# TODO : discover the exact conditions when the usage of -WF is needed.
 	mld_cv_define_prepend="-WF,"
+        if eval "$MPIFC -qversion 2>&1 | grep -e\"Version: 10\.\" 2>/dev/null"; then
+        	FDEFINES="$mld_cv_define_prepend-DXLF_10 $FDEFINES"		  
+        fi
+
  # Note : there coule be problems with old xlf compiler versions ( <10.1 )
  # since (as far as it is known to us) -WF, is not used in earlier versions.
  # More problems could be undocumented yet.
@@ -175,7 +179,7 @@ fi
 AC_LANG([C])
 if test "X$MPICC" = "X" ; then
     # This is our MPICC compiler preference: it will override ACX_MPI's first try.
-    AC_CHECK_PROGS([MPICC],[mpxlc mpcc pgcc mpicc])
+    AC_CHECK_PROGS([MPICC],[mpxlc mpcc mpicc])
 fi
 ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for C]])])