diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 53ca02cec..c17159863 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -99,10 +99,10 @@ index 0000000000000000000000000000000000000000..c76bfbcfbe034700bdbd9396643cfca6
 +}
 diff --git a/pom.xml b/pom.xml
 deleted file mode 100644
-index 9c130bf7fe7ec4b6b5d4f4c30cdbe6dc75b0f9a0..0000000000000000000000000000000000000000
+index 2bd4a47e18c0fb798d52d204a4315a889b0e64b4..0000000000000000000000000000000000000000
 --- a/pom.xml
 +++ /dev/null
-@@ -1,262 +0,0 @@
+@@ -1,263 +0,0 @@
 -
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -330,6 +330,7 @@ index 9c130bf7fe7ec4b6b5d4f4c30cdbe6dc75b0f9a0..00000000000000000000000000000000
 -                        </executions>
 -                        <configuration>
 -                            <configLocation>checkstyle.xml</configLocation>
+-                            <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
 -                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
 -                        </configuration>
 -                        <dependencies>
diff --git a/work/Bukkit b/work/Bukkit
index 8d8180320..6fac07ebf 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 8d8180320a17a60f563127fea77549ba420462c2
+Subproject commit 6fac07ebfb9c836546d4fe10772a32cfb8357149
diff --git a/work/CraftBukkit b/work/CraftBukkit
index c0326c284..1e87776ac 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit c0326c2840e9f91d6109c1f364c69b4053a787dc
+Subproject commit 1e87776acbb1f1c63fd9a5917b44eb2e7f1283a2