diff --git a/ChangeLog b/ChangeLog
index 7c227ab86..153121d9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-26  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-setup.c (setup): Clarify the error message.
+
 2010-10-26  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* include/grub/types.h (grub_target_off_t): Removed no longer used type.
diff --git a/util/grub-setup.c b/util/grub-setup.c
index 8ab33590b..588c87526 100644
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -385,7 +385,7 @@ setup (const char *dir,
 
     if (! dest_partmap)
       {
-	grub_util_warn (_("Attempting to install GRUB to a partitionless disk.  This is a BAD idea."));
+	grub_util_warn (_("Attempting to install GRUB to a partitionless disk or to a partition.  This is a BAD idea."));
 	goto unable_to_embed;
       }
     if (multiple_partmaps || fs)