diff --git a/ChangeLog b/ChangeLog
index cf926d708..dc8698ba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-setup.c (setup): Remove duplicate call to embed. Fixes
+	crash when embedding onto filesystem.
+
 2012-05-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* util/getroot.c (find_root_devices_from_poolname): Handle spaces in the
diff --git a/util/grub-setup.c b/util/grub-setup.c
index 9593957f0..dad1c15f8 100644
--- a/util/grub-setup.c
+++ b/util/grub-setup.c
@@ -481,8 +481,6 @@ setup (const char *dir,
 			  N_("Your embedding area is unusually small.  "
 			     "core.img won't fit in it."));
       }
-    err = dest_partmap->embed (dest_dev->disk, &nsec, maxsec,
-			       GRUB_EMBED_PCBIOS, &sectors);
     
     if (err)
       {