diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 903e76797..7959299d0 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-08  Corinna Vinschen  <corinna@vinschen.de>
+
+	* dll_init.cc (dll_list::alloc): Add DLL name to fabort output.  Fix
+	fabort string in case of bss start.
+
 2012-02-08  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/sys/sysmacros.h: Include sys/types.h.
diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc
index 8a72ecee6..e2e2858c8 100644
--- a/winsup/cygwin/dll_init.cc
+++ b/winsup/cygwin/dll_init.cc
@@ -149,17 +149,17 @@ dll_list::alloc (HINSTANCE h, per_process *p, dll_type type)
       else
 	{
 	  if (d->p.data_start != p->data_start)
-	    fabort ("data segment start: parent(%p) != child(%p)",
-		    d->p.data_start, p->data_start);
+	    fabort ("%W: data segment start: parent(%p) != child(%p)",
+		    name, d->p.data_start, p->data_start);
 	  else if (d->p.data_end != p->data_end)
-	    fabort ("data segment end: parent(%p) != child(%p)",
-		    d->p.data_end, p->data_end);
+	    fabort ("%W: data segment end: parent(%p) != child(%p)",
+		    name, d->p.data_end, p->data_end);
 	  else if (d->p.bss_start != p->bss_start)
-	    fabort ("data segment start: parent(%p) != child(%p)",
-		    d->p.bss_start, p->bss_start);
+	    fabort ("%W: bss segment start: parent(%p) != child(%p)",
+		    name, d->p.bss_start, p->bss_start);
 	  else if (d->p.bss_end != p->bss_end)
-	    fabort ("bss segment end: parent(%p) != child(%p)",
-		    d->p.bss_end, p->bss_end);
+	    fabort ("%W: bss segment end: parent(%p) != child(%p)",
+		    name, d->p.bss_end, p->bss_end);
 	}
       d->p = p;
     }