diff --git a/ChangeLog b/ChangeLog
index e3270830a..673e812d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-28  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/posix_wrap/sys/types.h [__APPLE__]: Include stddef
+	rather than defining size_t ourselves to avoid conflict.
+
 2012-05-28  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/fs/hfs.c (grub_hfs_dir): Use memset instead of
diff --git a/grub-core/lib/posix_wrap/sys/types.h b/grub-core/lib/posix_wrap/sys/types.h
index b21811606..0e61b7228 100644
--- a/grub-core/lib/posix_wrap/sys/types.h
+++ b/grub-core/lib/posix_wrap/sys/types.h
@@ -21,7 +21,11 @@
 
 #include <grub/misc.h>
 
+#ifndef __APPLE__
 typedef grub_size_t size_t;
+#else
+#include <stddef.h>
+#endif
 typedef grub_ssize_t ssize_t;
 #ifndef GRUB_POSIX_BOOL_DEFINED
 typedef enum { false = 0, true = 1 } bool;