diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 7076ff46c22..b2e61408861 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	PR gdb/17407
+	* elfcode.h (bfd_from_remote_memory): Use SIZE for HIGH_OFFSET.
+
 2014-09-16  Terry Guo  <terry.guo@arm.com>
 
 	* elf32-arm.c (elf32_arm_merge_eabi_attributes): Return false if
diff --git a/bfd/elfcode.h b/bfd/elfcode.h
index a49a7088ebb..ec53c3bbd8f 100644
--- a/bfd/elfcode.h
+++ b/bfd/elfcode.h
@@ -1749,7 +1749,7 @@ NAME(_bfd_elf,bfd_from_remote_memory)
 	     headers.  */
 	}
       else if (size >= shdr_end)
-	high_offset = shdr_end;
+	high_offset = size;
       else
 	{
 	  bfd_vma page_size = get_elf_backend_data (templ)->minpagesize;