diff --git a/changes-5.1.html b/changes-5.1.html
index e649df8fc..6a1cb4cba 100644
--- a/changes-5.1.html
+++ b/changes-5.1.html
@@ -17,6 +17,7 @@
 
 <h2>Yap-5.1.3:</h2>
 <ul>
+<li> FIXED: LAM compilation was broken (obs from Bernd Gutmann).</li>
 <li> FIXED: profon was broken.</li>
 <li> NEW: send newline even for unleashed ports (obs from Miguel
   Filgueiras).</li>
diff --git a/configure b/configure
index 647351d67..4e6741732 100755
--- a/configure
+++ b/configure
@@ -6205,72 +6205,6 @@ fi
   CC=${OLD_CC}
 fi
 
-# LAM
-OLD_CC=${CC}
-CC=${LAM_MPI_CC}
-{ echo "$as_me:$LINENO: checking for main in -llam" >&5
-echo $ECHO_N "checking for main in -llam... $ECHO_C" >&6; }
-if test "${ac_cv_lib_lam_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-llam  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_lam_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_lam_main=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_lam_main" >&5
-echo "${ECHO_T}$ac_cv_lib_lam_main" >&6; }
-if test $ac_cv_lib_lam_main = yes; then
-  LAMOBJS=yap_mpi@SHLIB_SUFFIX@
-else
-  LAMOBJS=no
-fi
-
-CC=${OLD_CC}
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -7251,6 +7185,72 @@ if test "$tabling" = "yes"
   YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1"
 fi
 
+# LAM
+OLD_CC=${CC}
+CC=${LAM_MPI_CC}
+{ echo "$as_me:$LINENO: checking for main in -llam" >&5
+echo $ECHO_N "checking for main in -llam... $ECHO_C" >&6; }
+if test "${ac_cv_lib_lam_main+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-llam  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+
+int
+main ()
+{
+return main ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_lam_main=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_lam_main=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lam_main" >&5
+echo "${ECHO_T}$ac_cv_lib_lam_main" >&6; }
+if test $ac_cv_lib_lam_main = yes; then
+  LAMOBJS=yap_mpi"$SHLIB_SUFFIX"
+else
+  LAMOBJS=no
+fi
+
+CC=${OLD_CC}
+
 { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
diff --git a/configure.in b/configure.in
index 2f3826e18..359fb970c 100644
--- a/configure.in
+++ b/configure.in
@@ -619,14 +619,6 @@ then
   CC=${OLD_CC}
 fi
 
-# LAM
-OLD_CC=${CC}	
-CC=${LAM_MPI_CC}
-AC_CHECK_LIB([lam], [main],
-	LAMOBJS=yap_mpi@SHLIB_SUFFIX@,
-	LAMOBJS=no)
-CC=${OLD_CC}
-
 AC_PROG_CPP
 
 if test "$cross_compiling" = "yes"
@@ -945,6 +937,14 @@ if test "$tabling" = "yes"
   YAP_EXTRAS="$YAP_EXTRAS -DTABLING=1"
 fi
 
+# LAM
+OLD_CC=${CC}	
+CC=${LAM_MPI_CC}
+AC_CHECK_LIB([lam], [main],
+	LAMOBJS=yap_mpi"$SHLIB_SUFFIX",
+	LAMOBJS=no)
+CC=${OLD_CC}
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT