diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 6f68dc3..02d589f 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -133,7 +133,7 @@
     <dependency>
       <groupId>org.bukkit</groupId>
       <artifactId>spigot-api</artifactId>
-      <version>1.8.4</version>
+      <version>1.8.6</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -148,12 +148,6 @@
       <version>1.8.4</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>spigot-185</artifactId>
-      <version>1.8.5</version>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
@@ -368,7 +362,7 @@
   <properties>
     <build.number>SNAPSHOT</build.number>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <bukkit.version>1.8.4</bukkit.version>
+    <bukkit.version>1.8.6</bukkit.version>
   </properties>
 </project>
 
diff --git a/pom.xml b/pom.xml
index a6b007c..cc711ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- Bukkit API Version, change if out dated -->
-        <bukkit.version>1.8.4</bukkit.version>
+        <bukkit.version>1.8.6</bukkit.version>
         <build.number>SNAPSHOT</build.number>
     </properties>
 
@@ -93,14 +93,6 @@
             <scope>provided</scope>
         </dependency>
         
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>spigot-185</artifactId>
-            <version>1.8.5</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-        
         <!-- PircBotX -->
         <dependency>
             <groupId>com.cnaude.pircbotx</groupId>
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185_186.java
similarity index 96%
rename from src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185.java
rename to src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185_186.java
index d3a0f4d..da76832 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/NetPacket_184_185_186.java
@@ -30,7 +30,7 @@ import net.minecraft.server.v1_8_R3.PlayerInteractManager;
  *
  * @author cnaude
  */
-public class NetPacket_184_185 {
+public class NetPacket_184_185_186 {
 
     public static PacketContainer add(String displayName) {
         UUID uuid = UUID.nameUUIDFromBytes(("OfflinePlayer:" + displayName).getBytes(Charsets.UTF_8));
diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
index 7fcac65..180897c 100644
--- a/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
+++ b/src/main/java/com/cnaude/purpleirc/Utilities/NetPackets.java
@@ -135,13 +135,15 @@ public class NetPackets {
             } catch (Exception ex) {
                 plugin.logError("tabPacket: " + ex.getMessage());
             }
-        } else if (version.contains("MC: 1.8.4") || version.contains("MC: 1.8.5")) {
+        } else if (version.contains("MC: 1.8.4")
+                || version.contains("MC: 1.8.5")
+                || version.contains("MC: 1.8.6")) {
             try {
                 if (add) {
-                    return NetPacket_184_185.add(displayName);
+                    return NetPacket_184_185_186.add(displayName);
                 } else {
                     plugin.logDebug("T: Removing: " + name);
-                    return NetPacket_184_185.rem(displayName);
+                    return NetPacket_184_185_186.rem(displayName);
                 }
             } catch (Exception ex) {
                 plugin.logError("tabPacket: " + ex.getMessage());