diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 086ec7885e..1d1a1d28c1 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2015-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/18718
+	* elflink.c (elf_link_output_extsym): Check symbol version
+	section check only if not linking executable, the symbol is
+	referenced by shared library or not locally defined.
+
 2015-07-25  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
 	* elf32-arm.c (elf32_arm_final_link_relocate): Use SYMBOLIC_BIND to
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index c800c605cf..5df4066919 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR ld/18718
+	* ld-elf/pr18718.c: New file.
+	* ld-elf/shared.exp: Run tests for PR ld/18718.
+
 2015-07-25  Alan Modra  <amodra@gmail.com>
 
 	* ld-elf/symbolic-func.s,