diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index cbd3eca6c5..25cf001e51 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-08  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* i386-dis.c (dofloat): Handle %rip-relative floating point addressing.
+
 2005-12-07  Hans-Peter Nilsson  <hp@axis.com>
 
 	* cris-opc.c (cris_opcodes) <"move" "s,P">: Define using
@@ -42,9 +46,9 @@
 	* Makefile.am (CFILES): Add cgen-bitset.c.
 	(ALL_MACHINES): Add cgen-bitset.lo.
 	(cgen-bitset.lo): New target.
-	* cgen-opc.c (cgen_bitset_create, cgen_bitset_init, cgen_bitset_clear) 
-	(cgen_bitset_add, cgen_bitset_set, cgen_bitset_contains) 
-	(cgen_bitset_compare, cgen_bitset_intersect_p, cgen_bitset_copy) 
+	* cgen-opc.c (cgen_bitset_create, cgen_bitset_init, cgen_bitset_clear)
+	(cgen_bitset_add, cgen_bitset_set, cgen_bitset_contains)
+	(cgen_bitset_compare, cgen_bitset_intersect_p, cgen_bitset_copy)
 	(cgen_bitset_union): Moved from here ...
 	* cgen-bitset.c: ... to here. New file.
 	* Makefile.in: Regenerated.
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 5adf4af64e..de70fab83b 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -2689,6 +2689,7 @@ dofloat (int sizeflag)
 
       putop (float_mem[fp_indx], sizeflag);
       obufp = op1out;
+      op_ad = 2;
       OP_E (float_mem_mode[fp_indx], sizeflag);
       return;
     }
@@ -2710,9 +2711,12 @@ dofloat (int sizeflag)
       putop (dp->name, sizeflag);
 
       obufp = op1out;
+      op_ad = 2;
       if (dp->op1)
 	(*dp->op1) (dp->bytemode1, sizeflag);
+
       obufp = op2out;
+      op_ad = 1;
       if (dp->op2)
 	(*dp->op2) (dp->bytemode2, sizeflag);
     }