diff --git a/ChangeLog b/ChangeLog
index dbdf4a1ff..1f6a2071e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/partmap/msdos.c (message_warn): Clarify messages.
+
 2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Support v2 xnu boot arguments.
diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
index 2b3bf167c..99fb85258 100644
--- a/grub-core/partmap/msdos.c
+++ b/grub-core/partmap/msdos.c
@@ -42,9 +42,11 @@ struct embed_signature
 };
 
 const char message_warn[][200] = {
-  [TYPE_RAID] = N_("Sector %llu is already in use by %s; avoiding it.  "
+  [TYPE_RAID] = N_("Sector %llu is already in use by raid controller `%s';"
+		   " avoiding it.  "
 		   "Please ask the manufacturer not to store data in MBR gap"),
-  [TYPE_SOFTWARE] = N_("Sector %llu is already in use by %s; avoiding it.  "
+  [TYPE_SOFTWARE] = N_("Sector %llu is already in use by the program `%s';"
+		       " avoiding it.  "
 		       "This software may cause boot or other problems in "
 		       "future.  Please ask its authors not to store data "
 		       "in the boot track")