diff --git a/anaconda.spec.in b/anaconda.spec.in
index 7010715b680c..5107400d5382 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -131,6 +131,10 @@ Requires: glibc-langpack-en
 # even though the distro default is dbus-broker in F30+
 Requires: dbus-daemon
 
+# Ensure it's not possible for a version of grubby to be installed
+# that doesn't work with btrfs subvolumes correctly...
+Conflicts: grubby < 8.40-10
+
 Obsoletes: anaconda-images <= 10
 Provides: anaconda-images = %{version}-%{release}
 Obsoletes: anaconda-runtime < %{version}-%{release}
diff --git a/pyanaconda/bootloader/grub2.py b/pyanaconda/bootloader/grub2.py
index 47c6fcb1374e..6d21ddbf3d6a 100644
--- a/pyanaconda/bootloader/grub2.py
+++ b/pyanaconda/bootloader/grub2.py
@@ -114,7 +114,7 @@ class GRUB2(BootLoader):
     stage2_must_be_primary = False
 
     # requirements for boot devices
-    stage2_device_types = ["partition", "mdarray"]
+    stage2_device_types = ["partition", "mdarray", "btrfs subvolume"]
     stage2_raid_levels = [raid.RAID0, raid.RAID1, raid.RAID4,
                           raid.RAID5, raid.RAID6, raid.RAID10]
     stage2_raid_member_types = ["partition"]