diff --git a/gas/ChangeLog b/gas/ChangeLog
index fd0861a4eae..0d55727e88c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2008-09-06  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* config/tc-mips.h (DWARF2_FDE_RELOC_SIZE): Define.
+
 2008-09-03  Nick Clifton  <nickc@redhat.com>
 
 	* config/tc-i386.c (pe_lcomm_internal): New function.  Allows the
diff --git a/gas/config/tc-mips.h b/gas/config/tc-mips.h
index ee88f47b7e7..ffd99e1ff96 100644
--- a/gas/config/tc-mips.h
+++ b/gas/config/tc-mips.h
@@ -168,6 +168,7 @@ extern enum dwarf2_format mips_dwarf2_format (asection *);
 
 extern int mips_dwarf2_addr_size (void);
 #define DWARF2_ADDR_SIZE(bfd) mips_dwarf2_addr_size ()
+#define DWARF2_FDE_RELOC_SIZE mips_dwarf2_addr_size ()
 
 #define TARGET_USE_CFIPOP 1
 
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 81ae42be46a..ca84798121f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-06  Richard Sandiford  <rdsandiford@googlemail.com>
+
+	* gas/mips/cfi-n64-1.s, gas/mips/cfi-n64-1.d: New test.
+	* gas/mips/mips.exp: Run it.
+
 2008-09-05  Nick Clifton  <nickc@redhat.com>
 
 	* gas/arm/abs12.d: Update expected disassembly.
diff --git a/gas/testsuite/gas/mips/cfi-n64-1.d b/gas/testsuite/gas/mips/cfi-n64-1.d
new file mode 100644
index 00000000000..808b3dae809
--- /dev/null
+++ b/gas/testsuite/gas/mips/cfi-n64-1.d
@@ -0,0 +1,9 @@
+#as: -64 -EB
+#objdump: -sj.eh_frame
+
+.*
+
+Contents of section \.eh_frame:
+ 0000 00000010 00000000 017a5200 017c1f01  .*
+ 0010 0c0d1d00 00000018 00000018 00000000  .*
+ 0020 00000000 00000000 0000000c 00000000  .*
diff --git a/gas/testsuite/gas/mips/cfi-n64-1.s b/gas/testsuite/gas/mips/cfi-n64-1.s
new file mode 100644
index 00000000000..8b0cf000fa9
--- /dev/null
+++ b/gas/testsuite/gas/mips/cfi-n64-1.s
@@ -0,0 +1,9 @@
+	.global	foo
+	.type	foo,@function
+	.ent	foo
+foo:
+	.cfi_startproc
+	jr	$31
+	nop
+	.cfi_endproc
+	.end	foo
diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp
index a037a998a5e..e48b81f08c9 100644
--- a/gas/testsuite/gas/mips/mips.exp
+++ b/gas/testsuite/gas/mips/mips.exp
@@ -833,4 +833,5 @@ if { [istarget mips*-*-vxworks*] } {
 
     run_dump_test "mips16-vis-1"
     run_dump_test "call-nonpic-1"
+    if $has_newabi { run_dump_test "cfi-n64-1" }
 }