diff --git a/ChangeLog b/ChangeLog
index 7367d9679..ab11ad50f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-25  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* configure.ac: Check for `limits.h'.
+	* util/misc.c: Include `<limits.h>' (for PATH_MAX).
+
 2010-01-24  Robert Millan  <rmh.grub@aybabtu.com>
 
 	* loader/mips/linux.c (grub_cmd_linux, grub_cmd_initrd): Don't
diff --git a/configure.ac b/configure.ac
index 012aef96e..be498be8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,7 +221,7 @@ AC_HEADER_MAJOR
 AC_HEADER_DIRENT
 AC_CHECK_FUNCS(memmove sbrk strdup lstat getuid getgid)
 AC_CHECK_HEADERS(sys/mkdev.h sys/sysmacros.h malloc.h termios.h sys/types.h)
-AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h)
+AC_CHECK_HEADERS(unistd.h string.h strings.h sys/stat.h sys/fcntl.h limits.h)
 
 #
 # Check for target programs.
diff --git a/util/misc.c b/util/misc.c
index 8f66e4350..371e7cc14 100644
--- a/util/misc.c
+++ b/util/misc.c
@@ -30,6 +30,9 @@
 #include <sys/time.h>
 #include <unistd.h>
 #include <time.h>
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
 
 #include <grub/kernel.h>
 #include <grub/misc.h>