diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 0ffb1bfd32c..26810de8460 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-30  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
+
+	DR206
+	PR c++/13813
+	* decl.c (grokdeclarator): Check immediatly type completeness for
+	non-dependent types.
+
 2004-01-30  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
 	PR c++/13683
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 6fa3faac36e..26955cfdf00 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -8177,7 +8177,7 @@ grokdeclarator (tree declarator,
 	    if (decl == NULL_TREE)
 	      return NULL_TREE;
 	  }
-	else if (!staticp && ! processing_template_decl
+	else if (!staticp && !dependent_type_p (type)
 		 && !COMPLETE_TYPE_P (complete_type (type))
 		 && (TREE_CODE (type) != ARRAY_TYPE || initialized == 0))
 	  {