diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c3229fc5789..70e7f204079 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-11-17  Sandra Loosemore  <sandra@codesourcery.com>
+
+	PR 48568
+	* doc/extend.texi (Common Function Attributes) [visibility]:
+	Add cross-references to matching variable and type attributes.
+	(Common Variable Attributes) [visibility]: Add missing entry.
+
 2015-11-17  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* config/rs6000/rs6000.c (rs6000_builtin_vectorized_function): Remove
diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi
index a81f8df0a24..63fce0f9cf4 100644
--- a/gcc/doc/extend.texi
+++ b/gcc/doc/extend.texi
@@ -3216,6 +3216,9 @@ class itself is instantiated.
 @item visibility ("@var{visibility_type}")
 @cindex @code{visibility} function attribute
 This attribute affects the linkage of the declaration to which it is attached.
+It can be applied to variables (@pxref{Common Variable Attributes}) and types
+(@pxref{Common Type Attributes}) as well as functions.
+
 There are four supported @var{visibility_type} values: default,
 hidden, protected or internal visibility.
 
@@ -5660,6 +5663,12 @@ struct S  __attribute__ ((vector_size (16))) foo;
 is invalid even if the size of the structure is the same as the size of
 the @code{int}.
 
+@item visibility ("@var{visibility_type}")
+@cindex @code{visibility} variable attribute
+This attribute affects the linkage of the declaration to which it is attached.
+The @code{visibility} attribute is described in
+@ref{Common Function Attributes}.
+
 @item weak
 @cindex @code{weak} variable attribute
 The @code{weak} attribute is described in