diff --git a/ChangeLog b/ChangeLog
index 230eb0cec..95aed126c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/partmap/gpt.c (gpt_partition_map_embed): Restore
+	disk->partiton for safety.
+
 2011-11-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/hostdisk.c (grub_util_biosdisk_get_grub_dev):
diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c
index 73a1c3b19..c8bc52609 100644
--- a/grub-core/partmap/gpt.c
+++ b/grub-core/partmap/gpt.c
@@ -140,11 +140,17 @@ gpt_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
 					   const grub_partition_t p)
   {
     struct grub_gpt_partentry gptdata;
+    grub_partition_t p2;
 
+    p2 = disk->partition;
     disk->partition = p->parent;
     if (grub_disk_read (disk, p->offset, p->index,
 			sizeof (gptdata), &gptdata))
-      return 0;
+      {
+	disk->partition = p2;
+	return 0;
+      }
+    disk->partition = p2;
 
     /* If there's an embed region, it is in a dedicated partition.  */
     if (! grub_memcmp (&gptdata.type, &grub_gpt_partition_type_bios_boot, 16))