diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9383ccd95e6..22afe1941f4 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-25  Jason Merrill  <jason@redhat.com>
+
+	* decl2.c (is_late_template_attribute): Don't defer attribute
+	visibility just because the type is dependent.
+
 2008-01-25  Jason Merrill  <jason@redhat.com>
 	    Mark Mitchell  <mark@codesourcery.com>
 
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 550d0bcebab..fa8d28a2542 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -1014,9 +1014,12 @@ is_late_template_attribute (tree attr, tree decl)
 	  || code == BOUND_TEMPLATE_TEMPLATE_PARM
 	  || code == TYPENAME_TYPE)
 	return true;
-      /* Also defer attributes on dependent types.  This is not necessary
-	 in all cases, but is the better default.  */
-      else if (dependent_type_p (type))
+      /* Also defer most attributes on dependent types.  This is not
+	 necessary in all cases, but is the better default.  */
+      else if (dependent_type_p (type)
+	       /* But attribute visibility specifically works on
+		  templates.  */
+	       && !is_attribute_p ("visibility", name))
 	return true;
       else
 	return false;