diff --git a/grub-2.00-no-double-free.patch b/grub-2.00-no-double-free.patch
new file mode 100644
index 0000000..5dd52a1
--- /dev/null
+++ b/grub-2.00-no-double-free.patch
@@ -0,0 +1,17 @@
+From: Vladimir Serbinenko <phcoder@gmail.com>
+Subject: Avoid double-free in grub-probe
+Date: 2012-06-05 15:16:14 +0000
+
+=== modified file 'util/grub-probe.c'
+--- a/util/grub-probe.c	2012-06-05 09:31:10 +0000
++++ b/util/grub-probe.c	2012-06-05 15:16:14 +0000
+@@ -169,8 +169,6 @@
+     }
+   *d = 0;
+ 
+-  free ((char *) orig_path);
+-
+   return new_path;
+ }
+ 
+
diff --git a/grub2.spec b/grub2.spec
index fd7e4a1..b6f195d 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -39,7 +39,7 @@
 Name:           grub2
 Epoch:          1
 Version:        2.0
-Release:        0.36.beta6%{?dist}
+Release:        0.37.beta6%{?dist}
 Summary:        Bootloader with support for Linux, Multiboot and more
 
 Group:          System Environment/Base
@@ -63,6 +63,7 @@ Patch16:	grub-2.00-no-huge-video.patch
 Patch17:	grub-2.00-ppc-hints.patch
 Patch18:	grub-2.00-support-vscsi-on-ibm-ppc.patch
 Patch19:	grub-2.00-ppc-usb-quiesce.patch
+Patch20:	grub-2.00-no-double-free.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -388,6 +389,9 @@ fi
 %doc grub-%{tarversion}/themes/starfield/COPYING.CC-BY-SA-3.0
 
 %changelog
+* Mon Jun 18 2012 Peter Jones <pjones@redhat.com> - 2.0-0.37.beta6
+- Fix double-free in grub-probe.
+
 * Wed Jun 06 2012 Peter Jones <pjones@redhat.com> - 2.0-0.36.beta6
 - Build with patch19 applied.