diff --git a/CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch b/CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
index 0f5e829c8..2d320188f 100644
--- a/CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
+++ b/CraftBukkit-Patches/0074-Add-VanillaCommand-Wrapper-to-Support-New-Commands.patch
@@ -1,4 +1,4 @@
-From b38f4afbdf46e734be406a03249a7388b223bae7 Mon Sep 17 00:00:00 2001
+From fc1e8ad76e7fbded89c1277ef6d5a3c21a4583e7 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Wed, 18 Dec 2013 10:32:15 +1100
 Subject: [PATCH] Add VanillaCommand Wrapper to Support New Commands
@@ -32,7 +32,7 @@ index e63f17c..e58be15 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5cd6f7d..232a604 100644
+index 716cb15..07fcf38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -546,6 +546,12 @@ public final class CraftServer implements Server {
@@ -76,7 +76,7 @@ index 5cd6f7d..232a604 100644
  
      public List<String> tabCompleteChat(Player player, String message) {
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index c4a5488..628533e 100644
+index c4a5488..1befcb9 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -6,6 +6,7 @@ import java.io.IOException;
@@ -95,14 +95,18 @@ index c4a5488..628533e 100644
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
  
-@@ -204,4 +206,13 @@ public class SpigotConfig
+@@ -204,4 +206,17 @@ public class SpigotConfig
          System.setProperty( "io.netty.eventLoopThreads", Integer.toString( count ) );
          Bukkit.getLogger().log( Level.INFO, "Using {0} threads for Netty based IO", count );
      }
 +
 +    private static void replaceCommands()
 +    {
-+        for ( String command : (List<String>) getList( "replace-commands", Arrays.asList( "setblock", "summon", "testforblock" ) ) )
++        if ( config.contains( "replace-commands" ) ) {
++            set( "commands.replace-commands", config.getStringList( "replace-commands" ) );
++            config.set( "replace-commands", null );
++        }
++        for ( String command : (List<String>) getList( "commands.replace-commands", Arrays.asList( "setblock", "summon", "testforblock" ) ) )
 +        {
 +            SimpleCommandMap.removeFallback( command );
 +            VanillaCommandWrapper.allowedCommands.add( command );
@@ -310,5 +314,5 @@ index 0000000..a6c76cc
 +    }
 +}
 -- 
-1.8.3.2
+1.8.4.msysgit.0
 
diff --git a/CraftBukkit-Patches/0086-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0086-Add-Late-Bind-Option.patch
index e9599e2b0..9dc4ffa15 100644
--- a/CraftBukkit-Patches/0086-Add-Late-Bind-Option.patch
+++ b/CraftBukkit-Patches/0086-Add-Late-Bind-Option.patch
@@ -1,4 +1,4 @@
-From 851a08e3828b82aa5833285611af33e71141a82d Mon Sep 17 00:00:00 2001
+From aaf097a40971ba23a677172d27fcba85531387b3 Mon Sep 17 00:00:00 2001
 From: slide23 <me@slide.ws>
 Date: Fri, 20 Dec 2013 20:15:33 -0600
 Subject: [PATCH] Add Late Bind Option
@@ -56,10 +56,10 @@ index c9bb3a6..8ec6474
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
 old mode 100644
 new mode 100755
-index 628533e..cb5002f
+index 1befcb9..b25395f
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
-@@ -215,4 +215,9 @@ public class SpigotConfig
+@@ -219,4 +219,9 @@ public class SpigotConfig
              VanillaCommandWrapper.allowedCommands.add( command );
          }
      }
diff --git a/CraftBukkit-Patches/0090-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0090-Allow-statistics-to-be-disabled-forced.patch
index 6cce8b080..161eedf0b 100644
--- a/CraftBukkit-Patches/0090-Allow-statistics-to-be-disabled-forced.patch
+++ b/CraftBukkit-Patches/0090-Allow-statistics-to-be-disabled-forced.patch
@@ -1,4 +1,4 @@
-From c73eb8c8476907817b0690014e5003e79f43dc1e Mon Sep 17 00:00:00 2001
+From 952dec3d35c4cba71cf919e45f5204397b551b15 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thethinkofdeath@gmail.com>
 Date: Tue, 7 Jan 2014 15:56:26 +0000
 Subject: [PATCH] Allow statistics to be disabled/forced
@@ -40,7 +40,7 @@ index 2f980cb..3f78728 100644
  
          super.a(entityhuman, statistic, i);
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index cb5002f..17e1d21 100755
+index b25395f..7f59b8f 100755
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -11,11 +11,14 @@ import java.util.HashMap;
@@ -58,7 +58,7 @@ index cb5002f..17e1d21 100755
  import org.bukkit.configuration.file.YamlConfiguration;
  import org.bukkit.craftbukkit.command.TicksPerSecondCommand;
  
-@@ -220,4 +223,31 @@ public class SpigotConfig
+@@ -224,4 +227,31 @@ public class SpigotConfig
      private static void lateBind() {
          lateBind = getBoolean( "settings.late-bind", false );
      }