diff --git a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch b/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
index f3d60e6aec..db6be7454e 100644
--- a/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
+++ b/Spigot-API-Patches/0035-Arrow-pickup-rule-API.patch
@@ -1,14 +1,14 @@
-From a3cf6f6205e8985b4c575a6028c5a4bbb5ca5ba7 Mon Sep 17 00:00:00 2001
+From 4c38a0b7c20bd533e8ca2f93edd4e1657aba85fe Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Fri, 4 Mar 2016 03:13:18 -0500
 Subject: [PATCH] Arrow pickup rule API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Arrow.java b/src/main/java/org/bukkit/entity/Arrow.java
-index 5850ab6c..a8d1826a 100644
+index 99814eee..34dde443 100644
 --- a/src/main/java/org/bukkit/entity/Arrow.java
 +++ b/src/main/java/org/bukkit/entity/Arrow.java
-@@ -90,4 +90,38 @@ public interface Arrow extends Projectile {
+@@ -108,4 +108,38 @@ public interface Arrow extends Projectile {
      @Override
      Spigot spigot();
      // Spigot end
@@ -48,5 +48,5 @@ index 5850ab6c..a8d1826a 100644
 +    // Paper end
  }
 -- 
-2.13.2
+2.17.0
 
diff --git a/work/Bukkit b/work/Bukkit
index 33a62b9591..222f7d167f 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 33a62b95913e6df50dc60f0fdad3144ba094bef7
+Subproject commit 222f7d167f7af6b4a96a320c0d69279c929ab17d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 1988d7f104..d0a3620c2d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 1988d7f1045b302b5b58d2018a4d1e27a4dbd8fd
+Subproject commit d0a3620c2dc8a22438808f395348c100a183a618