diff --git a/Spigot b/Spigot
index 04266858e3..f04e043eb1 160000
--- a/Spigot
+++ b/Spigot
@@ -1 +1 @@
-Subproject commit 04266858e3436dafcb20eba5ae3c9f6d63a7c5a9
+Subproject commit f04e043eb1aa5cb0c8450cd57d88fdb051cf99fd
diff --git a/upstreamMerge.sh b/upstreamMerge.sh
index d5e2868727..c3d5db20ad 100755
--- a/upstreamMerge.sh
+++ b/upstreamMerge.sh
@@ -12,5 +12,4 @@ function update {
 
 update Bukkit
 update CraftBukkit
-update Paperclip
-
+update Spigot