diff --git a/gold/ChangeLog b/gold/ChangeLog
index b765cd49462..e62857d8e9d 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-29  Ian Lance Taylor  <iant@google.com>
+
+	PR gold/12818
+	* symtab.cc (Symbol::should_add_dynsym_entry): Don't add undefined
+	symbols which are not used in a relocation.
+
 2011-06-28  Ian Lance Taylor  <iant@google.com>
 
 	PR gold/12898
diff --git a/gold/symtab.cc b/gold/symtab.cc
index 3df86b55c8f..7e5b66c83dd 100644
--- a/gold/symtab.cc
+++ b/gold/symtab.cc
@@ -414,6 +414,7 @@ Symbol::should_add_dynsym_entry(Symbol_table* symtab) const
   // externally visible, we need to add it.
   if ((parameters->options().export_dynamic() || parameters->options().shared())
       && !this->is_from_dynobj()
+      && !this->is_undefined()
       && this->is_externally_visible())
     return true;