diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 718381812c..b939b6f37e 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-24  Cary Coutant  <ccoutant@google.com>
+
+	* objdump.c (find_symbol_for_address): Avoid costly call to
+	bfd_octets_per_byte.
+
 2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* Makefile.am (am__skiplex, am__skipyacc): New.
diff --git a/binutils/objdump.c b/binutils/objdump.c
index 758b0be4a6..71909980b5 100644
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -747,7 +747,7 @@ find_symbol_for_address (bfd_vma vma,
   aux = (struct objdump_disasm_info *) info->application_data;
   abfd = aux->abfd;
   sec = aux->sec;
-  opb = bfd_octets_per_byte (abfd);
+  opb = info->octets_per_byte;
 
   /* Perform a binary search looking for the closest symbol to the
      required value.  We are searching the range (min, max].  */