diff --git a/Bukkit-Patches/0001-POM-Changes.patch b/Bukkit-Patches/0001-POM-Changes.patch
index 238831e393..472ed0430e 100644
--- a/Bukkit-Patches/0001-POM-Changes.patch
+++ b/Bukkit-Patches/0001-POM-Changes.patch
@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <artifactId>bukkit</artifactId>
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot-api</artifactId>
-     <version>1.8.7-R0.1-SNAPSHOT</version>
+     <version>1.8.8-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Bukkit</name>
diff --git a/CraftBukkit-Patches/0001-POM-Changes.patch b/CraftBukkit-Patches/0001-POM-Changes.patch
index a843d40939..2334b4c921 100644
--- a/CraftBukkit-Patches/0001-POM-Changes.patch
+++ b/CraftBukkit-Patches/0001-POM-Changes.patch
@@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    <groupId>org.spigotmc</groupId>
 +    <artifactId>spigot</artifactId>
      <packaging>jar</packaging>
-     <version>1.8.7-R0.1-SNAPSHOT</version>
+     <version>1.8.8-R0.1-SNAPSHOT</version>
 -    <name>CraftBukkit</name>
 -    <url>http://www.bukkit.org</url>
 +    <name>Spigot</name>
diff --git a/CraftBukkit-Patches/0015-Metrics.patch b/CraftBukkit-Patches/0015-Metrics.patch
index 718f728ea6..385c6eb5dc 100644
--- a/CraftBukkit-Patches/0015-Metrics.patch
+++ b/CraftBukkit-Patches/0015-Metrics.patch
@@ -686,6 +686,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      }
  
      static void readConfig(Class<?> clazz, Object instance)
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0029-Configurable-Messages.patch b/CraftBukkit-Patches/0029-Configurable-Messages.patch
index 8321d56a03..36ea437892 100644
--- a/CraftBukkit-Patches/0029-Configurable-Messages.patch
+++ b/CraftBukkit-Patches/0029-Configurable-Messages.patch
@@ -12,13 +12,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              // CraftBukkit end
  
              if (packethandshakinginsetprotocol.b() > 47) {
--                chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.7");
-+                chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.7" ) ); // Spigot
+-                chatcomponenttext = new ChatComponentText("Outdated server! I\'m still on 1.8.8");
++                chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedServerMessage, "1.8.8" ) ); // Spigot
                  this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext));
                  this.b.close(chatcomponenttext);
              } else if (packethandshakinginsetprotocol.b() < 47) {
--                chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.7");
-+                chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.7" ) ); // Spigot
+-                chatcomponenttext = new ChatComponentText("Outdated client! Please use 1.8.8");
++                chatcomponenttext = new ChatComponentText( java.text.MessageFormat.format( org.spigotmc.SpigotConfig.outdatedClientMessage, "1.8.8" ) ); // Spigot
                  this.b.handle(new PacketLoginOutDisconnect(chatcomponenttext));
                  this.b.close(chatcomponenttext);
              } else {
diff --git a/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch b/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch
index fd6fd9d42b..12d94f7282 100644
--- a/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch
+++ b/CraftBukkit-Patches/0064-Warn-if-PermGen-may-be-insufficient.patch
@@ -31,6 +31,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
                  System.out.println("Loading libraries, please wait...");
                  MinecraftServer.main(options);
              } catch (Throwable t) {
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch b/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch
index 8d01dfe5a7..917f8ab5d1 100644
--- a/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch
+++ b/CraftBukkit-Patches/0066-Add-Late-Bind-Option.patch
@@ -57,6 +57,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        lateBind = getBoolean( "settings.late-bind", false );
 +    }
  }
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch b/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch
index a125890d8e..e66bd7192f 100644
--- a/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch
+++ b/CraftBukkit-Patches/0067-Allow-statistics-to-be-disabled-forced.patch
@@ -88,6 +88,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +    }
  }
--- 
-1.9.0.msysgit.0
-
+--
\ No newline at end of file
diff --git a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch
index 105aaff9dc..28fbe89ec2 100644
--- a/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch
+++ b/CraftBukkit-Patches/0073-Highly-Optimized-Tick-Loop.patch
@@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          try {
              if (this.init()) {
 @@ -0,0 +0,0 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
-                 this.r.setServerInfo(new ServerPing.ServerData("1.8.7", 47));
+                 this.r.setServerInfo(new ServerPing.ServerData("1.8.8", 47));
                  this.a(this.r);
  
 +                // Spigot start