diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3f759e08a80..455d4411282 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-06  Alan Modra  <amodra@bigpond.net.au>
+
+	* frags.c (frag_offset_fixed_p): Reinitialise offset before
+	second scan.
+
 2006-04-05  Richard Sandiford  <richard@codesourcery.com>
 	    Daniel Jacobowitz  <dan@codesourcery.com>
 
diff --git a/gas/frags.c b/gas/frags.c
index cfd183fb3d4..b08ef502cbf 100644
--- a/gas/frags.c
+++ b/gas/frags.c
@@ -419,6 +419,7 @@ frag_offset_fixed_p (fragS *frag1, fragS *frag2, bfd_vma *offset)
     }
 
   /* Maybe frag1 is after frag2.  */
+  off = frag1->fr_address - frag2->fr_address;
   frag = frag2;
   while (frag->fr_type == rs_fill)
     {