diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index f57a473c2f8..ecd9e843889 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+1998-07-06  Jason Merrill  <jason@yorick.cygnus.com>
+
+	* decl.c (lookup_tag): Use CP_DECL_CONTEXT.
+
+	* tree.c (make_binfo): Fix length.
+
 1998-06-30  Benjamin Kosnik  <bkoz@bliss.nabi.net>
 
         * decl2.c (lang_decode_option): Remove warn_template_debugging.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 51218633ad0..2136417edcb 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -4414,7 +4414,7 @@ lookup_tag (form, name, binding_level, thislevel_only)
       else if (level->namespace_p)
 	/* Do namespace lookup. */
 	/* XXX: is this a real lookup, considering using-directives etc. ??? */
-	for (tail = current_namespace; 1; tail = DECL_CONTEXT (tail))
+	for (tail = current_namespace; 1; tail = CP_DECL_CONTEXT (tail))
 	  {
 	    tree old = BINDING_TYPE (binding_for_name (name, tail));
 	    /* If it has an original type, it is a typedef, and we
diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c
index 05c54fa7e64..87a64a3d969 100644
--- a/gcc/cp/tree.c
+++ b/gcc/cp/tree.c
@@ -1186,7 +1186,7 @@ make_binfo (offset, binfo, vtable, virtuals, chain)
      tree vtable, virtuals;
      tree chain;
 {
-  tree new_binfo = make_tree_vec (6);
+  tree new_binfo = make_tree_vec (7);
   tree type;
 
   if (TREE_CODE (binfo) == TREE_VEC)