diff --git a/ChangeLog b/ChangeLog
index 330656cc3..f82f12467 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-11  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/xzembed/xz_dec_stream.c (xz_dec_reset): Preserve context
+	pointer.
+
 2010-09-11  Szymon Janc <szymon@janc.net.pl>
 
 	* grub-core/commands/lsacpi.c (grub_cmd_lsacpi): Fix prototype.
diff --git a/grub-core/lib/xzembed/xz_dec_stream.c b/grub-core/lib/xzembed/xz_dec_stream.c
index 642492483..ff26f5119 100644
--- a/grub-core/lib/xzembed/xz_dec_stream.c
+++ b/grub-core/lib/xzembed/xz_dec_stream.c
@@ -830,8 +830,15 @@ void xz_dec_reset(struct xz_dec *s)
 	s->allow_buf_error = false;
 	s->pos = 0;
 
-	memzero(&s->block, sizeof(s->block));
-	memzero(&s->index, sizeof(s->index));
+	{
+		uint8_t *t;
+		t = s->block.hash.crc32_context;
+		memzero(&s->block, sizeof(s->block));
+		s->block.hash.crc32_context = t;
+		t = s->index.hash.crc32_context;
+		memzero(&s->index, sizeof(s->index));
+		s->index.hash.crc32_context = t;
+	}
 	s->temp.pos = 0;
 	s->temp.size = STREAM_HEADER_SIZE;