diff --git a/debian/changelog b/debian/changelog
index 1fda5b8fe..2dc6106ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grub2 (1.99-12) UNRELEASED; urgency=low
+
+  * Fix grub-probe detection for LSI MegaRAID SAS devices on kFreeBSD.
+    - kfreebsd_mfi_devices.diff
+
+ -- Robert Millan <rmh@debian.org>  Wed, 10 Aug 2011 22:34:10 +0200
+
 grub2 (1.99-11) unstable; urgency=low
 
   * Backport from upstream:
diff --git a/debian/patches/kfreebsd_mfi_devices.diff b/debian/patches/kfreebsd_mfi_devices.diff
new file mode 100644
index 000000000..6b0992eaa
--- /dev/null
+++ b/debian/patches/kfreebsd_mfi_devices.diff
@@ -0,0 +1,35 @@
+--- a/util/deviceiter.c
++++ b/util/deviceiter.c
+@@ -298,6 +298,12 @@
+ {
+   sprintf (name, "/dev/ar%d", unit);
+ }
++
++static void
++get_mfi_disk_name (char *name, int unit)
++{
++  sprintf (name, "/dev/mfid%d", unit);
++}
+ #endif
+ 
+ #ifdef __linux__
+@@ -658,6 +664,19 @@
+       if (check_device_readable_unique (name))
+ 	{
+ 	  if (hook (name, 0))
++	    goto out;
++        }
++    }
++
++  /* LSI MegaRAID SAS.  */
++  for (i = 0; i < 32; i++)
++    {
++      char name[20];
++
++      get_mfi_disk_name (name, i);
++      if (check_device_readable_unique (name))
++	{
++	  if (hook (name, 0))
+ 	    goto out;
+         }
+     }
diff --git a/debian/patches/series b/debian/patches/series
index fd62e295d..0d7683110 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ kfreebsd-9_ada_devices.patch
 gfxterm_background.patch
 zfs_packed_la_array.patch
 xen_replace.patch
+kfreebsd_mfi_devices.diff