diff --git a/BUGS b/BUGS
index 3428268..b1a8b77 100644
--- a/BUGS
+++ b/BUGS
@@ -75,9 +75,18 @@ Known bugs:
 Problems with known work-a-rounds:
 
     * The gcc as shipped with Redhat 7 perhaps other Linux distributions
-      has a bug causes calc to dump core on startup of it is
-      compiled BOTH optimized (-O, -O1, -O2 or -O3) as well as
-      with debugging (-g or -g3.
+      has a bug causes calc to dump core on startup when calc is:
+
+	  compiled optimized (-O, -O1, -O2 or -O3)
+
+	  	AND
+
+      	  compiled with debugging (-g or -g3)
+
+	  	AND
+
+	  when calc is compiled with readline (see USE_READLINE,
+	    READLINE_LIB and READLINE_INCLUDE in the Makefile)
 
       On Redhat, the gcc -v which has this problem is:
 
@@ -85,13 +94,33 @@ Problems with known work-a-rounds:
 
       there may be other gcc versions that also suffer this fate.
 
-      The work-a-round is to change the DEBUG Makefile variable to either:
+      The readlines associated with problem are:
 
-	compile for speed:  -O3
-	compile to debug:   -g3
+	readline-4.1-5
+	readline2.2.1-2.2.1-2
+	readline-devel-4.1-5
+
+      One work-a-round is to compile calc WITHOUT readline.  In the
+      Makefile be sure that:
+
+	USE_READLINE=
+	READLINE_LIB=
+	READLINE_INCLUDE=
+
+      i.e., these Makefile vars are empty.
+
+      If you must use readline, then an alternate work-a-round is to
+      change the DEBUG Makefile variable to either:
+
+	compile for speed:  -O3		(or -O2 if you do not have -O3)
+	compile to debug:   -g3		(or -g if you do not have -g3)
 
       but not both.
 
+      See RH bug #57889 for details:
+
+	http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=57889
+
     * There is a bug in gcc-2.95 that causes calc, when compiled with -O2,
       to fail the regression test.  The work-a-round is to compile with -O
       or to use gcc-2.96 or later.
@@ -259,8 +288,8 @@ Problems with known work-a-rounds:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.14 $
-## @(#) $Id: BUGS,v 29.14 2001/12/11 03:18:21 chongo Exp $
+## @(#) $Revision: 29.17 $
+## @(#) $Id: BUGS,v 29.17 2001/12/31 22:12:35 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/BUGS,v $
 ##
 ## Under source code control:	1994/03/18 14:06:13
diff --git a/CHANGES b/CHANGES
index 10634ae..b7347f3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,9 +15,8 @@ The following are the changes from calc version 2.11.5.5 to date:
 
     we recommend it.  But if not, you should set the USE_READLINE,
     READLINE_LIB, and READLINE_INCLUDE Makefile variables to empty.
-
-    Calc compiles without -g or -g3 by default use to recent gcc
-    bugs related to -O* and -g*.  *sigh*
+    NOTE: See the BUGS file for a Linux issue when compiling calc
+    with -O (or -O2 or -O3) AND with -g (or -g3) AND with readline.
 
 
 The following are the changes from calc version 2.11.5t4.1 to 2.11.5t4.4:
@@ -5380,8 +5379,8 @@ Following is a list of visible changes to calc from version 1.24.7 to 1.26.1:
 ## received a copy with calc; if not, write to Free Software Foundation, Inc.
 ## 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 ##
-## @(#) $Revision: 29.42 $
-## @(#) $Id: CHANGES,v 29.42 2001/12/11 02:51:00 chongo Exp $
+## @(#) $Revision: 29.45 $
+## @(#) $Id: CHANGES,v 29.45 2001/12/31 22:12:35 chongo Exp $
 ## @(#) $Source: /usr/local/src/cmd/calc/RCS/CHANGES,v $
 ##
 ## Under source code control:	1993/06/02 18:12:57
diff --git a/Makefile b/Makefile
index 9853b12..1b0cd10 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,8 @@
 # received a copy with calc; if not, write to Free Software Foundation, Inc.
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
 #
-MAKEFILE_REV= $$Revision: 29.38 $$
-# @(#) $Id: Makefile.ship,v 29.38 2001/12/11 02:35:43 chongo Exp $
+MAKEFILE_REV= $$Revision: 29.41 $$
+# @(#) $Id: Makefile.ship,v 29.41 2001/12/31 22:12:35 chongo Exp $
 # @(#) $Source: /usr/local/src/cmd/calc/RCS/Makefile.ship,v $
 #
 # Under source code control:	1990/02/15 01:48:41
@@ -700,8 +700,8 @@ CALCPAGER= more
 #DEBUG= -O1 -g
 #DEBUG= -O1 -g3
 #
-DEBUG= -O2
-#DEBUG= -O2 -g
+#DEBUG= -O2
+DEBUG= -O2 -g
 #DEBUG= -O2 -g3
 #DEBUG= -O2 -ipa
 #DEBUG= -O2 -g3 -ipa
diff --git a/version.c b/version.c
index 38f112c..cdb3b29 100644
--- a/version.c
+++ b/version.c
@@ -19,8 +19,8 @@
  * received a copy with calc; if not, write to Free Software Foundation, Inc.
  * 59 Temple Place, Suite 330, Boston, MA  02111-1307, USA.
  *
- * @(#) $Revision: 29.34 $
- * @(#) $Id: version.c,v 29.34 2001/12/11 02:54:14 chongo Exp $
+ * @(#) $Revision: 29.37 $
+ * @(#) $Id: version.c,v 29.37 2001/12/31 22:12:35 chongo Exp $
  * @(#) $Source: /usr/local/src/cmd/calc/RCS/version.c,v $
  *
  * Under source code control:	1990/05/22 11:00:58
@@ -46,7 +46,7 @@ static char *program;
 #define MAJOR_VER	2	/* major version */
 #define MINOR_VER	11	/* minor version */
 #define MAJOR_PATCH	5	/* patch level or 0 if no patch */
-#define MINOR_PATCH	5	/* test number or 0 if no minor patch */
+#define MINOR_PATCH	6	/* test number or 0 if no minor patch */
 
 
 /*