diff --git a/config/ChangeLog b/config/ChangeLog
index db528924a8..355f8cca9d 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-22  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* lyxinclude.m4 (LYX_PROG_CXX): do not enable stdlib-debug for
+	prereleases.
+
 2005-09-08  Angus Leeming  <leeming@lyx.org>
 
 	* spell.m4: correct grammar describing invocation of the
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 2a40c5e408..987b91f81a 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -186,7 +186,7 @@ AC_ARG_ENABLE(debug,
 
 AC_ARG_ENABLE(stdlib-debug,
   AC_HELP_STRING([--enable-stdlib-debug],[enable debug mode in the standard library]),,
-  [ if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
+  [ if test $lyx_devel_version = yes ; then
       enable_stdlib_debug=yes;
     else
       enable_stdlib_debug=no;