diff --git a/Spigot-API-Patches/0154-Add-Material-Tags.patch b/Spigot-API-Patches/0154-Add-Material-Tags.patch
index 39ae86730..0e163a9c3 100644
--- a/Spigot-API-Patches/0154-Add-Material-Tags.patch
+++ b/Spigot-API-Patches/0154-Add-Material-Tags.patch
@@ -943,6 +943,21 @@ index 0000000000000000000000000000000000000000..9266c9d77e2eef7cd717dc729834a190
 +        .add(DOLPHIN, SQUID, GUARDIAN, ELDER_GUARDIAN, TURTLE, COD, SALMON, PUFFERFISH, TROPICAL_FISH)
 +        .ensureSize("WATER_BASED", 9);
 +}
+diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
+index aacbfadc91f580cc667603c8165eacbadee38cca..3c2a6a2167eab43097f5d6ccf1550e12795fc0b6 100644
+--- a/src/main/java/org/bukkit/Tag.java
++++ b/src/main/java/org/bukkit/Tag.java
+@@ -10,6 +10,10 @@ import org.jetbrains.annotations.NotNull;
+  * Note that whilst all tags defined within this interface must be present in
+  * implementations, their existence is not guaranteed across future versions.
+  *
++ * <p>Custom tags defined by Paper are not present (as constants) in this class.
++ * To access them please refer to {@link com.destroystokyo.paper.MaterialTags}
++ * and {@link io.papermc.paper.tag.EntityTags}.</p>
++ *
+  * @param <T> the type of things grouped by this tag
+  */
+ public interface Tag<T extends Keyed> extends Keyed {
 diff --git a/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java b/src/test/java/com/destroystokyo/paper/MaterialTagsTest.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..328c51471dc12e81c1a1b643455337b3fef4d14a
diff --git a/Spigot-API-Patches/0264-Added-Vanilla-Entity-Tags.patch b/Spigot-API-Patches/0264-Added-Vanilla-Entity-Tags.patch
index b8047c597..9916b1726 100644
--- a/Spigot-API-Patches/0264-Added-Vanilla-Entity-Tags.patch
+++ b/Spigot-API-Patches/0264-Added-Vanilla-Entity-Tags.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added Vanilla Entity Tags
 
 
 diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
-index aacbfadc91f580cc667603c8165eacbadee38cca..cbefdacee2d7b29a705de20935e20380a4632e14 100644
+index 3c2a6a2167eab43097f5d6ccf1550e12795fc0b6..c1ec099448d57f2a5f973ac5b4e4a25b79ea2112 100644
 --- a/src/main/java/org/bukkit/Tag.java
 +++ b/src/main/java/org/bukkit/Tag.java
-@@ -421,6 +421,32 @@ public interface Tag<T extends Keyed> extends Keyed {
+@@ -425,6 +425,32 @@ public interface Tag<T extends Keyed> extends Keyed {
       * Vanilla fluid tag representing water and flowing water.
       */
      Tag<Fluid> FLUIDS_WATER = Bukkit.getTag(REGISTRY_FLUIDS, NamespacedKey.minecraft("water"), Fluid.class);