diff --git a/gas/ChangeLog b/gas/ChangeLog
index 7116952e9c8..eea3d4069b1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-30  Catherine Moore  <clm@cygnus.com>
+
+	* config/tc-arm.c (tc_gen_reloc):  Record the vtable entry in
+	the relocation's section offset.
+
 1999-07-29  Alan Modra  <alan@spri.levels.unisa.edu.au>
 
 	* write.c (fixup_segment): Fix generic error check overflow test.
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 7a90601a5cc..22f2697a50b 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -6000,6 +6000,11 @@ tc_gen_reloc (section, fixp)
       return NULL;
     }
 
+   /* HACK: Since arm ELF uses Rel instead of Rela, encode the
+      vtable entry to be used in the relocation's section offset.  */
+   if (fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY)
+     reloc->address = fixp->fx_offset;
+
   return reloc;
 }