diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 1f5a62d05a..f30d5cd36a 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -9,6 +9,8 @@
 	(Files): Document the possibility of loading unlinked object
 	files.  Add more indexing for solib-absolute-prefix and
 	--with-sysroot.
+	(Machine Code): Document possible problems with locations in
+	shared libraries.
 
 2005-06-18  Nick Roberts  <nickrob@snap.net.nz>
 
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 14adf08993..b9c6599247 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -4922,6 +4922,12 @@ End of assembler dump.
 Some architectures have more than one commonly-used set of instruction
 mnemonics or other syntax.
 
+For programs that were dynamically linked and use shared libraries,
+instructions that call functions or branch to locations in the shared
+libraries might show a seemingly bogus location---it's actually a
+location of the relocation table.  On some architectures, @value{GDBN}
+might be able to resolve these to actual function names.
+
 @table @code
 @kindex set disassembly-flavor
 @cindex Intel disassembly flavor