diff --git a/ChangeLog b/ChangeLog
index 5efa965e9..57a54d99d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/libgcrypt_wrap/cipher_wrap.h: Define size_t to
+	grub_size_t. This fixes the case when size_t mismatches grub_size_t.
+
 2013-10-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/grub-mkimagexx.c (make_reloc_section): Fix memory leak.
diff --git a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
index 7d7c7c672..a3f55a54f 100644
--- a/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
+++ b/grub-core/lib/libgcrypt_wrap/cipher_wrap.h
@@ -27,6 +27,8 @@
 
 #include <sys/types.h>
 
+#define size_t grub_size_t
+
 #undef __GNU_LIBRARY__
 #define __GNU_LIBRARY__ 1