diff --git a/Spigot-API-Patches/0003-Timings-v2.patch b/Spigot-API-Patches/0003-Timings-v2.patch
index 606397fbd1..53d98937ac 100644
--- a/Spigot-API-Patches/0003-Timings-v2.patch
+++ b/Spigot-API-Patches/0003-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 73206dd905b3bf4d1d007221e57fefba6d8e0e13 Mon Sep 17 00:00:00 2001
+From 6492832b42e6eaca00bc3cf12ab9782a03c1e186 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -2927,7 +2927,7 @@ index 3f07d7f..f89ad07 100644
          return i >= j && i <= k;
      }
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index a08a49d..d1a047a 100644
+index f180da0..594deb9 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -31,7 +31,7 @@ public class SimpleCommandMap implements CommandMap {
@@ -2944,8 +2944,8 @@ index a08a49d..d1a047a 100644
       */
      public boolean register(String label, String fallbackPrefix, Command command) {
 +        command.timings = co.aikar.timings.TimingsManager.getCommandTiming(fallbackPrefix, command); // Spigot
-         label = label.toLowerCase().trim();
-         fallbackPrefix = fallbackPrefix.toLowerCase().trim();
+         label = label.toLowerCase(java.util.Locale.ENGLISH).trim();
+         fallbackPrefix = fallbackPrefix.toLowerCase(java.util.Locale.ENGLISH).trim();
          boolean registered = register(label, command, false, fallbackPrefix);
 @@ -135,6 +136,12 @@ public class SimpleCommandMap implements CommandMap {
              return false;
@@ -3236,7 +3236,7 @@ index 9b20d5c..54e8a5c 100644
  
      Spigot spigot();
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index c9d23d6..1325b03 100644
+index 1056186..4ee123e 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -295,7 +295,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3252,7 +3252,7 @@ index c9d23d6..1325b03 100644
          if (result != null) {
              plugins.add(result);
 -            lookupNames.put(result.getDescription().getName(), result);
-+            lookupNames.put(result.getDescription().getName().toLowerCase(), result); // Spigot
++            lookupNames.put(result.getDescription().getName().toLowerCase(java.util.Locale.ENGLISH), result); // Spigot
          }
  
          return result;
@@ -3261,7 +3261,7 @@ index c9d23d6..1325b03 100644
       */
      public synchronized Plugin getPlugin(String name) {
 -        return lookupNames.get(name.replace(' ', '_'));
-+        return lookupNames.get(name.replace(' ', '_').toLowerCase()); // Spigot
++        return lookupNames.get(name.replace(' ', '_').toLowerCase(java.util.Locale.ENGLISH)); // Spigot
      }
  
      public synchronized Plugin[] getPlugins() {
@@ -3598,5 +3598,5 @@ index 8d98297..7e89b97 100644
 -    }
  }
 -- 
-2.8.3
+2.9.0.windows.1
 
diff --git a/work/Bukkit b/work/Bukkit
index c3a46c9b8d..f0973327a9 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit c3a46c9b8db54daf9425d73aa593e494f809bbde
+Subproject commit f0973327a93ed495f86e96a3e32bc5678b66a15d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 568e27fbd0..0ebb9c7afa 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 568e27fbd08cf5717ff23f01cc57c37f83ec8218
+Subproject commit 0ebb9c7afa7b79222b7f6ec5fffcaa0aa41de7b9
diff --git a/work/Spigot b/work/Spigot
index 687a0190ef..5391d732ff 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit 687a0190ef59611cca4cba981e17b4881c51df17
+Subproject commit 5391d732ffc9118bda74005a22e90efd749b3983