diff --git a/gold/ChangeLog b/gold/ChangeLog
index ef47e8ea2b..8e8493f0a4 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-01  Rafael Espindola  <espindola@google.com>
+
+	* plugin.cc (Sized_pluginobj::::do_add_symbols): Correctly set the
+	visibility of symbols.
+
 2010-05-27  Doug Kwan  <dougkwan@google.com>
 
 	* object.cc (Sized_relobj::do_finalize_local_symbols): Use offset
diff --git a/gold/plugin.cc b/gold/plugin.cc
index 2ee1301a53..a7bdbb5380 100644
--- a/gold/plugin.cc
+++ b/gold/plugin.cc
@@ -647,13 +647,13 @@ Sized_pluginobj<size, big_endian>::do_add_symbols(Symbol_table* symtab,
       switch (isym->visibility)
         {
         case LDPV_PROTECTED:
-          vis = elfcpp::STV_DEFAULT;
+          vis = elfcpp::STV_PROTECTED;
           break;
         case LDPV_INTERNAL:
-          vis = elfcpp::STV_DEFAULT;
+          vis = elfcpp::STV_INTERNAL;
           break;
         case LDPV_HIDDEN:
-          vis = elfcpp::STV_DEFAULT;
+          vis = elfcpp::STV_HIDDEN;
           break;
         case LDPV_DEFAULT:
         default: