diff --git a/Bukkit b/Bukkit
index 409595c2a2..6fb1647394 160000
--- a/Bukkit
+++ b/Bukkit
@@ -1 +1 @@
-Subproject commit 409595c2a2415e4ff731bc7c2454e37a5a97ac2a
+Subproject commit 6fb1647394289a45b71f442647303d06921b376c
diff --git a/CraftBukkit b/CraftBukkit
index 5bbee6cf1c..25e5ff3268 160000
--- a/CraftBukkit
+++ b/CraftBukkit
@@ -1 +1 @@
-Subproject commit 5bbee6cf1ccc91a705e067d351ada3100832d865
+Subproject commit 25e5ff32686556a38a978c0c1c173000b0eb3e0b