diff --git a/ld/ChangeLog b/ld/ChangeLog
index 7c694ded02..977e4c9337 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-10  Alan Modra  <amodra@bigpond.net.au>
+
+	* scripttempt/elf.sc (.bss): Align tail in a way that allows
+	empty section pruning.
+
 2005-06-09  Steve Ellcey  <sje@cup.hp.com>
 
 	* configure.in (AM_BINUTILS_WARNINGS): Add.
diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index e7702a31e5..1c22141e77 100644
--- a/ld/scripttempl/elf.sc
+++ b/ld/scripttempl/elf.sc
@@ -398,7 +398,7 @@ cat <<EOF
    /* Align here to ensure that the .bss section occupies space up to
       _end.  Align after .bss to ensure correct alignment even if the
       .bss section disappears because there are no input sections.  */
-   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
+   ${RELOCATING+. = ALIGN(. != 0 ? ${ALIGNMENT} : 1);}
   }
   ${OTHER_BSS_SECTIONS}
   ${RELOCATING+. = ALIGN(${ALIGNMENT});}