diff --git a/ChangeLog b/ChangeLog
index 6252c3d8e..7402b9e7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/xzembed/xz_dec_stream.c (hash_validate): Use void *
+	for context.
+
 2012-02-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/ldm.c (make_vg): Init part.name.
diff --git a/grub-core/lib/xzembed/xz_dec_stream.c b/grub-core/lib/xzembed/xz_dec_stream.c
index 1d789d9ba..0d79b1f0b 100644
--- a/grub-core/lib/xzembed/xz_dec_stream.c
+++ b/grub-core/lib/xzembed/xz_dec_stream.c
@@ -381,7 +381,7 @@ static enum xz_ret hash_validate(struct xz_dec *s, struct xz_buf *b,
 {
 #ifndef GRUB_EMBED_DECOMPRESSOR
 	const gcry_md_spec_t *hash = crc32 ? s->crc32 : s->hash;
-	grub_uint64_t *hash_context = crc32 ? s->crc32_context 
+	void *hash_context = crc32 ? s->crc32_context 
 		: s->hash_context;
 	if(!s->have_hash_value && hash
 		&& sizeof (s->hash_value) >= hash->mdlen)