diff --git a/ChangeLog b/ChangeLog
index 4cfe4c576..a3050ee07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
+
+	Fix build with non-GNU libcs.
+
+	* util/misc.c (canonicalize_file_name): Move to ...
+	* kern/emu/misc.c (canonicalize_file_name): ... here.  Needed by
+	grub_make_system_path_relative_to_its_root.
+
 2010-05-18  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-mkrescue.in: Sync up with grub-install in terms of how
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 4888f4a6b..54c808a47 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -176,6 +176,19 @@ grub_get_rtc (void)
 	     * GRUB_TICKS_PER_SECOND / 1000000));
 }
 
+char *
+canonicalize_file_name (const char *path)
+{
+  char *ret;
+#ifdef PATH_MAX
+  ret = xmalloc (PATH_MAX);
+  (void) realpath (path, ret);
+#else
+  ret = realpath (path, NULL);
+#endif
+  return ret;
+}
+
 #ifdef __CYGWIN__
 /* Convert POSIX path to Win32 path,
    remove drive letter, replace backslashes.  */
diff --git a/util/misc.c b/util/misc.c
index 6785eb00f..46e5c6093 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -286,19 +286,6 @@ fail:
 
 #endif /* __MINGW32__ */
 
-char *
-canonicalize_file_name (const char *path)
-{
-  char *ret;
-#ifdef PATH_MAX
-  ret = xmalloc (PATH_MAX);
-  (void) realpath (path, ret);
-#else
-  ret = realpath (path, NULL);
-#endif
-  return ret;
-}
-
 #ifdef GRUB_UTIL
 void
 grub_util_init_nls (void)