diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch
index b0fc6d504..b1c26a86c 100644
--- a/patches/api/Convert-project-to-Gradle.patch
+++ b/patches/api/Convert-project-to-Gradle.patch
@@ -330,6 +330,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
-
-
- checkstyle.xml
+- checkstyle-suppressions.xml
- true
-
-
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