diff --git a/Spigot-API-Patches/Add-Material-Tags.patch b/Spigot-API-Patches/Add-Material-Tags.patch
index d9ba39d5c..37893e6f1 100644
--- a/Spigot-API-Patches/Add-Material-Tags.patch
+++ b/Spigot-API-Patches/Add-Material-Tags.patch
@@ -750,11 +750,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        .ensureSize("CORAL_FANS", 20);
 +
 +    /**
-+     * Covers the variants of coral blocks.
++     * Covers all items that can be enchanted from the enchantment table or anvil.
 +     */
-+    public static final MaterialSetTag CORAL_BLOCKS = new MaterialSetTag(keyFor("coral_blocks"))
-+        .endsWith("_CORAL_BLOCK")
-+        .ensureSize("CORAL_BLOCKS", 10);
++    public static final MaterialSetTag ENCHANTABLE = new MaterialSetTag(keyFor("enchantable"))
++            .add(PICKAXES, SWORDS, SHOVELS, AXES, HOES, HELMETS, CHEST_EQUIPPABLE, LEGGINGS, BOOTS, BOWS)
++            .add(Material.TRIDENT, Material.SHIELD, Material.FISHING_ROD, Material.SHEARS, Material.FLINT_AND_STEEL, Material.CARROT_ON_A_STICK, Material.WARPED_FUNGUS_ON_A_STICK)
++            .ensureSize("ENCHANTABLE", 65);
 +}
 diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
 new file mode 100644