diff --git a/Spigot-API-Patches/Material-API-additions.patch b/Spigot-API-Patches/Material-API-additions.patch
index 9e108ac767..30f9e1562e 100644
--- a/Spigot-API-Patches/Material-API-additions.patch
+++ b/Spigot-API-Patches/Material-API-additions.patch
@@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
  public enum Material implements Keyed {
      //<editor-fold desc="Materials" defaultstate="collapsed">
-     ACACIA_BOAT(27326, 1),
+     AIR(9648, 0),
 @@ -0,0 +0,0 @@ public enum Material implements Keyed {
          }
      }
diff --git a/work/Bukkit b/work/Bukkit
index 6ff65c824a..1cb03826eb 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 6ff65c824ad8dc9ba9228999800a0d7010904893
+Subproject commit 1cb03826ebde4ef887519ce37b0a2a341494a183
diff --git a/work/CraftBukkit b/work/CraftBukkit
index d9bd43b060..551e770f5f 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit d9bd43b060322ad72af3008669878ee5d6cc2cc0
+Subproject commit 551e770f5f981053885e2e1a043b4ecb54a80aef