diff --git a/ChangeLog b/ChangeLog
index 70e24ef15..38ee89b04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-28  Carles Pina i Estany  <carles@pina.cat>
+
+	* normal/misc.c (grub_normal_print_device_info): Add spaces and double
+	quotes.
+
 2009-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* kern/parser.c (grub_parser_split_cmdline): Don't dereference NULL.
diff --git a/normal/misc.c b/normal/misc.c
index 18e20d2fc..17ba372ce 100644
--- a/normal/misc.c
+++ b/normal/misc.c
@@ -68,7 +68,10 @@ grub_normal_print_device_info (const char *name)
 	      if (grub_errno == GRUB_ERR_NONE)
 		{
 		  if (label && grub_strlen (label))
-		    grub_printf_ (N_("- Label %s"), label);
+		    {
+		      grub_putchar (' ');
+		      grub_printf_ (N_("- Label \"%s\""), label);
+		    }
 		  grub_free (label);
 		}
 	      grub_errno = GRUB_ERR_NONE;
@@ -81,6 +84,7 @@ grub_normal_print_device_info (const char *name)
 	      if (grub_errno == GRUB_ERR_NONE)
 		{
 		  grub_unixtime2datetime (tm, &datetime);
+		  grub_putchar (' ');
 		  grub_printf_ (N_("- Last modification time %d-%02d-%02d "
 			       "%02d:%02d:%02d %s"),
 			       datetime.year, datetime.month, datetime.day,