diff --git a/ld/ChangeLog b/ld/ChangeLog
index d0f1a421cb..218ed098de 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-11  Aleksey Romanov <aromanov@ennovatenetworks.com>
+
+	* scripttempl/armaout.sc: Place .bss section after end of aligned
+	data section to match behaviour of aout code in constructrion of
+	header.
+
 2001-10-11  Danny Smith  <danny_r_smith_2001@yahoo.co.nz>
 
 	* pe-dll.c (autofilter_entry_type autofilter_liblist: Add
diff --git a/ld/scripttempl/armaout.sc b/ld/scripttempl/armaout.sc
index e9276a877e..9bae887ddb 100644
--- a/ld/scripttempl/armaout.sc
+++ b/ld/scripttempl/armaout.sc
@@ -20,10 +20,10 @@ SECTIONS
     ${RELOCATING+__sdata_ = .;}
     *(.data)
     ${CONSTRUCTING+CONSTRUCTORS}
-    ${RELOCATING+_edata  =  .;}
-    ${RELOCATING+__edata  =  .;}
+    ${RELOCATING+_edata  =  ${DATA_ALIGNMENT};}
+    ${RELOCATING+__edata  =  ${DATA_ALIGNMENT};}
   }
-  .bss ${RELOCATING+ SIZEOF(.data) + ADDR (.data)} :
+  .bss ${RELOCATING+${DATA_ALIGNMENT}} :
   {
    ${RELOCATING+ __bss_start = .};
    *(.bss)