diff --git a/Makefile.in b/Makefile.in
index 2e02aa269..d43f32d6d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -545,7 +545,7 @@ install_data:
 	(cd LGPL/clp ; make install)
 	(cd LGPL/clpr ; make install)
 #	(cd CHR ; make install)
-	(cd LGPL/chr ; make install)
+#	(cd LGPL/chr ; make install)
 	(cd CLPBN ; make install)
 
 
diff --git a/changes-5.1.html b/changes-5.1.html
index 8f45af725..f4eb54227 100644
--- a/changes-5.1.html
+++ b/changes-5.1.html
@@ -16,6 +16,7 @@
 
 <h2>Yap-5.1.0:</h2>
 <ul>
+<li> NEW: make enable-max-memory default. </li>
 <li> FIXED: allow people to disable indexing (obs Ricardo Lopes). </li>
 <li> FIXED: make undefined exception more ISO like (obs Paulo Moura). </li>
 <li> FIXED: add missing dependency in chr's Makefile.in. </li>
diff --git a/configure b/configure
index bbb39bd97..d4beef5b9 100755
--- a/configure
+++ b/configure
@@ -2359,7 +2359,7 @@ if test "${enable_max_memory+set}" = set; then
   enableval="$enable_max_memory"
   maxmemory="$enableval"
 else
-  maxmemory=no
+  maxmemory=yes
 fi;
 # Check whether --enable-debug-yap or --disable-debug-yap was given.
 if test "${enable_debug_yap+set}" = set; then
diff --git a/configure.in b/configure.in
index 597c62628..feec5fee2 100644
--- a/configure.in
+++ b/configure.in
@@ -60,7 +60,7 @@ AC_ARG_ENABLE(max-performance,
 	maxperformance="$enableval", maxperformance=no)
 AC_ARG_ENABLE(max-memory,
 	[ --enable-max-memory        try using the best flags for using the memory to the most ],
-	maxmemory="$enableval", maxmemory=no)
+	maxmemory="$enableval", maxmemory=yes)
 AC_ARG_ENABLE(debug-yap,
 	[ --enable-debug-yap         enable C-debugging for YAP ],
 	debugyap="$enableval", debugyap=no)