diff --git a/Spigot-API-Patches/Allow-ProtocolLib-to-be-enabled.patch b/Spigot-API-Patches/Allow-ProtocolLib-to-be-enabled.patch
new file mode 100644
index 0000000000..f67dd15238
--- /dev/null
+++ b/Spigot-API-Patches/Allow-ProtocolLib-to-be-enabled.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Mon, 1 Sep 2014 15:33:27 -0500
+Subject: [PATCH] Allow ProtocolLib to be enabled
+
+
+diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
++++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+@@ -0,0 +0,0 @@ public final class SimplePluginManager implements PluginManager {
+                 description = loader.getPluginDescription(file);
+                 String name = description.getName();
+                 // Spigot Start
+-                if ( name.equalsIgnoreCase( "ProtocolLib" ) )
+-                {
+-                    server.getLogger().log( Level.WARNING, "Skipping loading of ProtocolLib as it does not work with Spigot 1.8 builds!" );
+-                    continue;
+-                }
+                 if ( name.equalsIgnoreCase( "Orebfuscator" ) )
+                 {
+                     server.getLogger().log( Level.WARNING, "Skipping loading of Orebfuscator as it does not work with Spigot 1.8 builds!" );
+--
\ No newline at end of file
diff --git a/Spigot-Server-Patches/Fix-for-ProtocolLib-compatibility.patch b/Spigot-Server-Patches/Fix-for-ProtocolLib-compatibility.patch
new file mode 100644
index 0000000000..b5693c2a1c
--- /dev/null
+++ b/Spigot-Server-Patches/Fix-for-ProtocolLib-compatibility.patch
@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Minecrell <dev@minecrell.net>
+Date: Mon, 1 Sep 2014 15:33:57 -0500
+Subject: [PATCH] Fix for ProtocolLib compatibility
+
+
+diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/NetworkManager.java
++++ b/src/main/java/net/minecraft/server/NetworkManager.java
+@@ -0,0 +0,0 @@ public class NetworkManager extends SimpleChannelInboundHandler {
+ 
+     // Spigot start - protocol patch
+     public void enableCompression() {
+-        m.pipeline().addBefore( "decoder", "decompress", new SpigotDecompressor() );
++        // PaperSpigot start - Fix ProtocolLib compatibility
++        if ( m.pipeline().get("protocol_lib_decoder") != null ) {
++            m.pipeline().addBefore( "protocol_lib_decoder", "decompress", new SpigotDecompressor() );
++        } else {
++            m.pipeline().addBefore( "decoder", "decompress", new SpigotDecompressor() );
++        }
++        // PaperSpigot end
++
+         m.pipeline().addBefore( "encoder", "compress", new SpigotCompressor() );
+     }
+     // Spigot end
+--
\ No newline at end of file