diff --git a/ChangeLog b/ChangeLog
index d151d9b42..8af6cd441 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-07-01  Pavel Roskin  <proski@gnu.org>
 
+	* include/grub/types.h: Define GRUB_LONG_MAX and GRUB_LONG_MIN
+	using signed long int constants.
+
 	* util/hostdisk.c (grub_util_biosdisk_get_grub_dev): Make `p'
 	constant to avoid a warning on FreeBSD.
 
diff --git a/include/grub/types.h b/include/grub/types.h
index 3eb8290af..8e2ad15ef 100644
--- a/include/grub/types.h
+++ b/include/grub/types.h
@@ -102,12 +102,12 @@ typedef grub_int32_t	grub_ssize_t;
 
 #if GRUB_CPU_SIZEOF_VOID_P == 8
 # define GRUB_ULONG_MAX 18446744073709551615UL
-# define GRUB_LONG_MAX 9223372036854775807UL
-# define GRUB_LONG_MIN -9223372036854775808UL
+# define GRUB_LONG_MAX 9223372036854775807L
+# define GRUB_LONG_MIN (-9223372036854775807L - 1)
 #else
 # define GRUB_ULONG_MAX 4294967295UL
-# define GRUB_LONG_MAX 2147483647UL
-# define GRUB_LONG_MIN -2147483648UL
+# define GRUB_LONG_MAX 2147483647L
+# define GRUB_LONG_MIN (-2147483647L - 1)
 #endif
 
 #if GRUB_CPU_SIZEOF_VOID_P == 4