diff --git a/CraftBukkit-Patches/0165-Ability-to-disable-asynccatcher.patch b/CraftBukkit-Patches/0165-Ability-to-disable-asynccatcher.patch
new file mode 100644
index 000000000..ad91d0eea
--- /dev/null
+++ b/CraftBukkit-Patches/0165-Ability-to-disable-asynccatcher.patch
@@ -0,0 +1,40 @@
+From 66a59ccca452c2b062e5a7651eae0a1c3e80785d Mon Sep 17 00:00:00 2001
+From: Zach Brown <Zbob750@live.com>
+Date: Sat, 14 Jun 2014 22:39:58 -0500
+Subject: [PATCH] Ability to disable asynccatcher
+
+
+diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
+index 4b3aa85..4c78409 100644
+--- a/src/main/java/org/spigotmc/AsyncCatcher.java
++++ b/src/main/java/org/spigotmc/AsyncCatcher.java
+@@ -5,7 +5,7 @@ import net.minecraft.server.MinecraftServer;
+ public class AsyncCatcher
+ {
+ 
+-    public static boolean enabled = true;
++    public static boolean enabled = SpigotConfig.asyncCatcherFeature; // PaperSpigot - AsyncCatcher override feature
+ 
+     public static void catchOp(String reason)
+     {
+diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
+index 5ddd593..1e6544a 100644
+--- a/src/main/java/org/spigotmc/SpigotConfig.java
++++ b/src/main/java/org/spigotmc/SpigotConfig.java
+@@ -324,4 +324,13 @@ public class SpigotConfig
+     {
+         intCacheLimit = getInt( "settings.int-cache-limit", 1024 );
+     }
++
++    public static boolean asyncCatcherFeature;
++    private static void asyncCatcherFeature()
++    {
++        asyncCatcherFeature = getBoolean( "settings.async-plugin-bad-magic-catcher", true );
++        if ( !asyncCatcherFeature ) {
++            Bukkit.getLogger().log( Level.INFO, "Disabling async plugin bad ju-ju catcher, this might be bad depending on your plugins" );
++        }
++    }
+ }
+-- 
+1.9.1
+