diff --git a/gas/ChangeLog b/gas/ChangeLog
index b995c68136..092f385db7 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-18  Nick Clifton  <nickc@redhat.com>
 
+	* symbols.c (resolve_symbol_value): Use bfd_octets_per_byte
+	instead of OCTETS_PER_BYTE.
+
 	* config/tc-v850.c: Fix compile time warnings.
 	* config/tc-ppc.c: Fix compile time warnings.
 
diff --git a/gas/symbols.c b/gas/symbols.c
index b54a2fd937..68c50bbbaa 100644
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -862,10 +862,10 @@ resolve_symbol_value (symp, finalize)
       struct local_symbol *locsym = (struct local_symbol *) symp;
 
       if (local_symbol_resolved_p (locsym))
-	return locsym->lsy_offset / OCTETS_PER_BYTE;
+	return locsym->lsy_offset / bfd_octets_per_byte (stdoutput);
 
       final_val = (local_symbol_get_frag (locsym)->fr_address
-		   + locsym->lsy_offset) / OCTETS_PER_BYTE;
+		   + locsym->lsy_offset) / bfd_octets_per_byte (stdoutput);
 
       if (finalize)
 	{