diff --git a/ChangeLog b/ChangeLog
index 19db47e04..44882054c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/posix_wrap/ctype.h (isxdigit): Use grub_isxdigit.
+	* include/grub/misc.h (grub_isxdigit): New function.
+	* grub-core/video/colors.c (my_isxdigit): Removed. All users
+	switched to grub_isxdigit.
+	* grub-core/term/serial.c (grub_serial_find): Fix in case of port
+	number starting with a letter.
+
 2011-10-09  Robert Millan  <rmh@gnu.org>
 
 	LVM support for FreeBSD and GNU/kFreeBSD.
@@ -63,6 +72,12 @@
 	(grub_get_unaligned64): Likewise.
 	* util/import_gcry.py (cryptolist): Add adler32.
 
+2011-10-05  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/Makefile.core.def: Eliminate rarely used emu_condition. This
+	in perspective decreases the complexity of build system and fixes
+	compilation right now.
+
 2011-10-01  Ales Nesrsta <starous@volny.cz>
 
 	* grub-core/bus/usb/uhci.c: Changes made by Rock Cui - thanks!
diff --git a/grub-core/lib/posix_wrap/ctype.h b/grub-core/lib/posix_wrap/ctype.h
index 2dc3e53e9..9589778b6 100644
--- a/grub-core/lib/posix_wrap/ctype.h
+++ b/grub-core/lib/posix_wrap/ctype.h
@@ -54,8 +54,7 @@ isupper (int c)
 static inline int
 isxdigit (int c)
 {
-  return (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')
-    || (c >= '0' && c <= '9');
+  return grub_isxdigit (c);
 }
 
 static inline int 
diff --git a/grub-core/term/serial.c b/grub-core/term/serial.c
index b724a945a..306694192 100644
--- a/grub-core/term/serial.c
+++ b/grub-core/term/serial.c
@@ -136,7 +136,7 @@ grub_serial_find (char *name)
 
 #ifndef GRUB_MACHINE_EMU
   if (!port && grub_memcmp (name, "port", sizeof ("port") - 1) == 0
-      && grub_isdigit (name [sizeof ("port") - 1]))
+      && grub_isxdigit (name [sizeof ("port") - 1]))
     {
       name = grub_serial_ns8250_add_port (grub_strtoul (&name[sizeof ("port") - 1],
 							0, 16));
diff --git a/grub-core/video/colors.c b/grub-core/video/colors.c
index 3119c0249..06625183e 100644
--- a/grub-core/video/colors.c
+++ b/grub-core/video/colors.c
@@ -211,14 +211,6 @@ grub_video_get_named_color (const char *name,
   return 0;
 }
 
-static __inline int
-my_isxdigit (char c)
-{
-  return ((c >= '0' && c <= '9')
-          || (c >= 'a' && c <= 'f')
-          || (c >= 'A' && c <= 'F'));
-}
-
 static int
 parse_hex_color_component (const char *s, unsigned start, unsigned end)
 {
@@ -267,7 +259,7 @@ grub_video_parse_color (const char *s, grub_video_rgba_color_t *color)
       /* Count the hexits to determine the format.  */
       int hexits = 0;
       const char *end = s;
-      while (my_isxdigit (*end))
+      while (grub_isxdigit (*end))
         {
           end++;
           hexits++;
diff --git a/include/grub/misc.h b/include/grub/misc.h
index da4bd4a7e..66e74d8a8 100644
--- a/include/grub/misc.h
+++ b/include/grub/misc.h
@@ -136,6 +136,12 @@ grub_isdigit (int c)
   return (c >= '0' && c <= '9');
 }
 
+static inline int
+grub_isxdigit (int c)
+{
+  return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F');
+}
+
 static inline int
 grub_isalnum (int c)
 {