diff --git a/ChangeLog b/ChangeLog
index e495fbf9a..1c4bbb5ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/getroot.c (grub_util_get_grub_dev): Add missing
+	const attribute and use grub_isdigit.
+
 2011-04-06  Andrey  <dev_null@ukr.net>
 
 	* grub-core/video/fb/video_fb.c (grub_video_fb_setup): Silence older
diff --git a/grub-core/kern/emu/getroot.c b/grub-core/kern/emu/getroot.c
index ae066d2f8..8f65d92c5 100644
--- a/grub-core/kern/emu/getroot.c
+++ b/grub-core/kern/emu/getroot.c
@@ -808,10 +808,10 @@ grub_util_get_grub_dev (const char *os_dev)
 	if (mdadm_name)
 	  {
 	    char *newname;
-	    char *q;
+	    const char *q;
 
-	    for (q = os_dev + strlen (os_dev) - 1; q >= os_dev && isdigit (*q);
-		 q--);
+	    for (q = os_dev + strlen (os_dev) - 1; q >= os_dev
+		   && grub_isdigit (*q); q--);
 
 	    if (q >= os_dev && *q == 'p')
 	      {