diff --git a/CraftBukkit-Patches/0052-Allow-Disabling-of-Command-TabComplete.patch b/CraftBukkit-Patches/0052-Allow-Disabling-of-Command-TabComplete.patch
new file mode 100644
index 000000000..03392dda9
--- /dev/null
+++ b/CraftBukkit-Patches/0052-Allow-Disabling-of-Command-TabComplete.patch
@@ -0,0 +1,37 @@
+From 958e2c8da37c37b1aab8a7875c609ee878e28bcf Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Fri, 21 Jun 2013 18:05:54 +1000
+Subject: [PATCH] Allow Disabling of Command TabComplete
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 8990b9f..f41d740 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1352,7 +1352,7 @@ public final class CraftServer implements Server {
+     public List<String> tabCompleteCommand(Player player, String message) {
+         List<String> completions = null;
+         try {
+-            completions = getCommandMap().tabComplete(player, message.substring(1));
++            completions = (org.spigotmc.SpigotConfig.tabComplete) ? getCommandMap().tabComplete(player, message.substring(1)) : null;
+         } catch (CommandException ex) {
+             player.sendMessage(ChatColor.RED + "An internal error occurred while attempting to tab-complete this command");
+             getLogger().log(Level.SEVERE, "Exception when " + player.getName() + " attempted to tab complete " + message, ex);
+diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
+index b283c7d..56012e1 100644
+--- a/src/main/java/org/spigotmc/SpigotConfig.java
++++ b/src/main/java/org/spigotmc/SpigotConfig.java
+@@ -195,4 +195,10 @@ public class SpigotConfig
+     {
+         logCommands = getBoolean( "commands.log", true );
+     }
++
++    public static boolean tabComplete;
++    private void tabComplete()
++    {
++        tabComplete = getBoolean( "commands.tab-complete", true );
++    }
+ }
+-- 
+1.8.1.2
+