diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 1b18b8aed75c397a9d358f606bbd246dee08c58a..ed0250efc3b32a6b9e1be02d7f716e8d4261c1e7 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 Tue Aug 19 02:26:07 1997  Jason Merrill  <jason@yorick.cygnus.com>
 
+	* pt.c (lookup_nested_type_by_name): Handle typedef wierdness.
+
+	* typeck2.c (my_friendly_abort): Report bugs to egcs-bugs@cygnus.com.
+
 	* pt.c (instantiate_class_template): Call repo_template_used
 	before finish_prevtable_vardecl.
 
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 001a9223f0c976a9ec0b8917ac19b3bc53581539..e13b19de900dd355b33cb546c2adb210961fff91 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -1368,7 +1368,9 @@ lookup_nested_type_by_name (ctype, name)
 
   for (t = CLASSTYPE_TAGS (ctype); t; t = TREE_CHAIN (t))
     {
-      if (name == TREE_PURPOSE (t))
+      if (name == TREE_PURPOSE (t)
+	  /* this catches typedef enum { foo } bar; */
+	  || name == TYPE_IDENTIFIER (TREE_VALUE (t)))
 	return TREE_VALUE (t);
     }
   return NULL_TREE;
diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c
index d2a9839db9642f2feb4ae8333fa0a2d2e30d5e2b..93b80967aaa4a10e78497643d468b7ba490d9335 100644
--- a/gcc/cp/typeck2.c
+++ b/gcc/cp/typeck2.c
@@ -323,7 +323,7 @@ my_friendly_abort (i)
 	    ack ("Internal compiler error.");
 	  else
 	    ack ("Internal compiler error %d.", i);
-	  ack ("Please submit a full bug report to `bug-g++@prep.ai.mit.edu'.");
+	  ack ("Please submit a full bug report to `egcs-bugs@cygnus.com'.");
 	}
       else
 	error ("confused by earlier errors, bailing out");
@@ -337,7 +337,7 @@ my_friendly_abort (i)
   else
     error ("Internal compiler error %d.", i);
 
-  fatal ("Please submit a full bug report to `bug-g++@prep.ai.mit.edu'.");
+  fatal ("Please submit a full bug report to `egcs-bugs@cygnus.com'.");
 }
 
 void