diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7174955a79..37a1fb24d3 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,7 @@
 1999-07-21  Mark Elbrecht  <snowball3@bigfoot.com>
 
+	* scripttempl/i386go32.sc: Add handling of linkonce sections.
+
 	* configure.bat: Remove; obsolete.
 	* emulparams/go32.sh: Remove; obsolete.
 	* scripttempl/go32coff.sc: Remove; obsolete.
diff --git a/ld/scripttempl/i386go32.sc b/ld/scripttempl/i386go32.sc
index 6bd3d09ff5..303e792767 100644
--- a/ld/scripttempl/i386go32.sc
+++ b/ld/scripttempl/i386go32.sc
@@ -17,8 +17,10 @@ SECTIONS
 {
   .text ${RELOCATING+ ${TARGET_PAGE_SIZE}+SIZEOF_HEADERS} : {
     *(.text)
+    ${RELOCATING+*(.gnu.linkonce.t*)}
     *(.const*)
     *(.ro*)
+    ${RELOCATING+*(.gnu.linkonce.r*)}
     ${RELOCATING+etext  =  . ; _etext = .};
     ${RELOCATING+. = ALIGN(${SEGMENT_SIZE});}
   }
@@ -30,8 +32,9 @@ SECTIONS
     *(.dtor)
     djgpp_last_dtor = . ;}
     *(.data)
-    ${RELOCATING+ edata  =  . ; _edata = .};
-    ${RELOCATING+ . = ALIGN(${SEGMENT_SIZE});}
+    ${RELOCATING+*(.gnu.linkonce.d*)}
+    ${RELOCATING+edata  =  . ; _edata = .};
+    ${RELOCATING+. = ALIGN(${SEGMENT_SIZE});}
   }
   ${CONSTRUCTING+${RELOCATING-$CTOR}}
   ${CONSTRUCTING+${RELOCATING-$DTOR}}