diff --git a/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch b/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch
index 5d7e66d78a..4e904473c6 100644
--- a/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch
+++ b/Spigot-API-Patches/Add-FastUtil-to-Bukkit.patch
@@ -10,7 +10,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
-     </pluginRepositories>
+     </repositories>
  
      <dependencies>
 +        <dependency>
diff --git a/Spigot-API-Patches/Adventure.patch b/Spigot-API-Patches/Adventure.patch
index 230a06e1f9..cc36348f01 100644
--- a/Spigot-API-Patches/Adventure.patch
+++ b/Spigot-API-Patches/Adventure.patch
@@ -11,8 +11,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
-         </pluginRepository>
-     </pluginRepositories>
+         </repository>
+     </repositories>
  
 +    <!-- Paper start -->
 +    <dependencyManagement>
diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch
index b1791b20bf..449fe6efb9 100644
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -40,30 +40,22 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      </properties>
  
 -    <distributionManagement>
--        <repository>
++    <repositories>
+         <repository>
 -            <id>spigotmc-releases</id>
 -            <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
--        </repository>
++            <id>sonatype</id>
++            <url>https://oss.sonatype.org/content/groups/public/</url>
+         </repository>
 -        <snapshotRepository>
 -            <id>spigotmc-snapshots</id>
 -            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
 -        </snapshotRepository>
 -    </distributionManagement>
--
-     <repositories>
-         <!--
-             If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
-@@ -0,0 +0,0 @@
-             <id>spigotmc-public</id>
-             <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
-         </repository>
-+        <repository>
-+            <id>sonatype</id>
-+            <url>https://oss.sonatype.org/content/groups/public/</url>
-+        </repository>
-     </repositories>
++    </repositories>
  
-     <pluginRepositories>
+     <dependencies>
+         <dependency>
 @@ -0,0 +0,0 @@
              <version>2.6</version>
              <scope>compile</scope>
@@ -102,8 +94,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -                    <compilerId>eclipse</compilerId>
 -                </configuration>
                  <dependencies>
-                     <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
+                         <groupId>org.codehaus.plexus</groupId>
 @@ -0,0 +0,0 @@
                              </excludes>
                          </filter>
diff --git a/work/Bukkit b/work/Bukkit
index d264e972e9..c589f5464d 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit d264e972e9fecfea2f4a016c5d89ab8611680eb3
+Subproject commit c589f5464d0c822a21ffff763af526ef4ecfb243