diff --git a/Spigot-API-Patches/Add-getTPS-method.patch b/Spigot-API-Patches/Add-getTPS-method.patch
index 77a412e81a..0a671eb08c 100644
--- a/Spigot-API-Patches/Add-getTPS-method.patch
+++ b/Spigot-API-Patches/Add-getTPS-method.patch
@@ -22,4 +22,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      Spigot spigot();
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-API-Patches/POM-changes.patch b/Spigot-API-Patches/POM-changes.patch
index 3a4f9fd91a..969560adde 100644
--- a/Spigot-API-Patches/POM-changes.patch
+++ b/Spigot-API-Patches/POM-changes.patch
@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>org.github.paperspigot</groupId>
 +    <artifactId>paperspigot-api</artifactId>
-     <version>1.8.6-R0.1-SNAPSHOT</version>
+     <version>1.8.7-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>
@@ -34,4 +34,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      <description>An enhanced plugin API for Minecraft servers.</description>
  
      <properties>
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Further-improve-server-tick-loop.patch b/Spigot-Server-Patches/Further-improve-server-tick-loop.patch
index 787822137d..9748f19f46 100644
--- a/Spigot-Server-Patches/Further-improve-server-tick-loop.patch
+++ b/Spigot-Server-Patches/Further-improve-server-tick-loop.patch
@@ -211,4 +211,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      {
          return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
                  + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
index 147a58b643..e11d45a9fd 100644
--- a/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
+++ b/Spigot-Server-Patches/Optimize-TileEntity-Ticking.patch
@@ -261,4 +261,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +}
 \ No newline at end of file
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index db47379d18..dca547d3ca 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -17,7 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    <groupId>org.github.paperspigot</groupId>
 +    <artifactId>paperspigot</artifactId>
      <packaging>jar</packaging>
-     <version>1.8.6-R0.1-SNAPSHOT</version>
+     <version>1.8.7-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>http://www.spigotmc.org</url>
 +    <name>PaperSpigot</name>
@@ -62,15 +62,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                          </configuration>
                          <phase>initialize</phase>
                          <goals>
-@@ -0,0 +0,0 @@
-                         </goals>
-                     </execution>
-                 </executions>
--            </plugin>  
-+            </plugin>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-jar-plugin</artifactId>
 @@ -0,0 +0,0 @@
                          <manifestEntries>
                              <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
@@ -93,4 +84,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          Properties properties = new Properties();
  
          if (stream != null) {
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+
diff --git a/Spigot-Server-Patches/Player-affects-spawning-API.patch b/Spigot-Server-Patches/Player-affects-spawning-API.patch
index fb12448c50..4c9942f655 100644
--- a/Spigot-Server-Patches/Player-affects-spawning-API.patch
+++ b/Spigot-Server-Patches/Player-affects-spawning-API.patch
@@ -197,4 +197,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      };
  
      public Player.Spigot spigot()
---
\ No newline at end of file
+-- 
+1.9.5.msysgit.1
+