diff --git a/gas/ChangeLog b/gas/ChangeLog
index d88e39d7a0..842d603b2c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-31  Thiemo Seufer  <ths@mips.com>
+
+	* config/tc-mips.c (md_apply_fix, tc_gen_reloc): Remove special
+	handling for BFD_RELOC_MIPS16_JMP.
+
 2006-07-24  Andreas Schwab  <schwab@suse.de>
 
 	PR/2756
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 196d2513d7..f9cca4d230 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -11787,14 +11787,8 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
     case BFD_RELOC_MIPS16_GPREL:
     case BFD_RELOC_MIPS16_HI16:
     case BFD_RELOC_MIPS16_HI16_S:
-      /* Nothing needed to do. The value comes from the reloc entry */
-      break;
-
     case BFD_RELOC_MIPS16_JMP:
-      /* We currently always generate a reloc against a symbol, which
-         means that we don't want an addend even if the symbol is
-         defined.  */
-      *valP = 0;
+      /* Nothing needed to do. The value comes from the reloc entry */
       break;
 
     case BFD_RELOC_64:
@@ -13568,10 +13562,6 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixp)
   else
     reloc->addend = fixp->fx_addnumber;
 
-  /* Handle relocs adjusted against a section symbol.  */
-  if (fixp->fx_r_type == BFD_RELOC_MIPS16_JMP)
-    reloc->addend += fixp->fx_offset;
-
   /* Since the old MIPS ELF ABI uses Rel instead of Rela, encode the vtable
      entry to be used in the relocation's section offset.  */
   if (! HAVE_NEWABI && fixp->fx_r_type == BFD_RELOC_VTABLE_ENTRY)