diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 8f05be8d0..58dcce372 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-23  Kazu Hirata  <kazu@codesourcery.com>
+
+	* m68k/fido.sc (.data): Move .jcr to .text.  Catch .got.plt
+	and .got.
+
 2007-05-07  Patrick Mansfield  <patmans@us.ibm.com>
 
 	* spu/open.c: Unconditionally set the "mode" to fix a bug where
diff --git a/libgloss/m68k/fido.sc b/libgloss/m68k/fido.sc
index 99c2014ce..6d7f503ab 100644
--- a/libgloss/m68k/fido.sc
+++ b/libgloss/m68k/fido.sc
@@ -156,6 +156,11 @@ SECTIONS {
     KEEP (*(SORT(.dtors.*)))
     KEEP (*crtend.o(.dtors))
 
+    . = ALIGN(0x4);
+    KEEP (*crtbegin.o(.jcr))
+    KEEP (*(EXCLUDE_FILE (*crtend.o) .jcr))
+    KEEP (*crtend.o(.jcr))
+
     *(.rodata .rodata.*)
     *(.gnu.linkonce.r.*)
     *(.gcc_except_table) 
@@ -187,7 +192,7 @@ SECTIONS {
   .data :
   {
     _data = .;
-    KEEP (*(.jcr));
+    *(.got.plt) *(.got)
     *(.shdata);
     *(.data .data.*)
     *(.gnu.linkonce.d.*)