--- /etc/grub.d/00_header.orig	2012-10-14 13:36:31.000000000 -0400
+++ /etc/grub.d/00_header	2013-01-28 14:17:54.000000000 -0500
@@ -44,12 +44,33 @@
 if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_entry}' ; fi
 if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi
 
+GRUBFS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`"
+
+if [ x"$GRUBFS" = x ]; then
+    GRUBFS="$(stat -f --printf=%T / || true)"
+fi
+
+case x"$GRUBFS" in
+    xbtrfs)
+	grub_warn "GRUB environment block is not yet supported on btrfs"
+cat << EOF
+
+# GRUB environment block is not yet supported on btrfs
+# (https://bugs.launchpad.net/bugs/736743)
+set have_grubenv=
+
+EOF
+	;;
+    *)
 cat << EOF
 if [ -s \$prefix/grubenv ]; then
   set have_grubenv=true
   load_env
 fi
 EOF
+	;;
+esac
+
 if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then
     cat <<EOF
 if cmostest $GRUB_BUTTON_CMOS_ADDRESS ; then