diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
index c5f66944..16947f5f 100644
--- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
+++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch
@@ -1,4 +1,4 @@
-From 191537fa1c2a977e38a048777a16285445e5e461 Mon Sep 17 00:00:00 2001
+From d4af481b892c372d6ddc4f69629ec56538759adb Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sun, 2 Jun 2013 15:10:56 +1000
 Subject: [PATCH] Skeleton API Implementations
@@ -144,10 +144,10 @@ index a7cda388d..858be927f 100644
 +    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index ca9ea5eb0..4229c88dd 100644
+index 8615d7bcf..967d5ba30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-@@ -357,6 +357,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -349,6 +349,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
          if (this.pages != null) {
              meta.pages = new ArrayList<String>(this.pages);
          }
@@ -155,7 +155,7 @@ index ca9ea5eb0..4229c88dd 100644
          return meta;
      }
  
-@@ -430,4 +431,15 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -422,4 +423,15 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
  
          return builder;
      }
diff --git a/CraftBukkit-Patches/0063-Better-item-validation.patch b/CraftBukkit-Patches/0063-Better-item-validation.patch
index a6bd6a7e..b637e58a 100644
--- a/CraftBukkit-Patches/0063-Better-item-validation.patch
+++ b/CraftBukkit-Patches/0063-Better-item-validation.patch
@@ -1,4 +1,4 @@
-From 7df88643bf89dd8244a6e2c3755e9642e67774b8 Mon Sep 17 00:00:00 2001
+From b7c56d82900c0f89794117975d0cbcff8fabd286 Mon Sep 17 00:00:00 2001
 From: Thinkofdeath <thinkofdeath@spigotmc.org>
 Date: Wed, 2 Jul 2014 23:35:51 +0100
 Subject: [PATCH] Better item validation
@@ -20,12 +20,12 @@ index e06014976..91bbb9ff4 100644
              }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 4229c88dd..d14b5c38d 100644
+index 967d5ba30..82c1487db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-@@ -22,6 +22,10 @@ import org.bukkit.craftbukkit.util.CraftMagicNumbers;
+@@ -20,6 +20,10 @@ import org.bukkit.craftbukkit.util.CraftChatMessage;
+ import org.bukkit.craftbukkit.util.CraftMagicNumbers;
  import org.bukkit.inventory.meta.BookMeta;
- import org.bukkit.inventory.meta.BookMeta.Generation;
  
 +// Spigot start
 +import static org.spigotmc.ValidateUtils.*;
@@ -34,7 +34,7 @@ index 4229c88dd..d14b5c38d 100644
  @DelegateDeserialization(SerializableMeta.class)
  public class CraftMetaBook extends CraftMetaItem implements BookMeta {
      static final ItemMetaKey BOOK_TITLE = new ItemMetaKey("title");
-@@ -82,11 +86,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -80,11 +84,11 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
          super(tag);
  
          if (tag.contains(BOOK_TITLE.NBT)) {
@@ -48,7 +48,7 @@ index 4229c88dd..d14b5c38d 100644
          }
  
          if (tag.contains(RESOLVED.NBT)) {
-@@ -114,7 +118,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -112,7 +116,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
                  } else {
                      page = validatePage(page);
                  }
diff --git a/CraftBukkit-Patches/0079-BungeeCord-Chat-API.patch b/CraftBukkit-Patches/0079-BungeeCord-Chat-API.patch
index 35a12f29..0da7c01f 100644
--- a/CraftBukkit-Patches/0079-BungeeCord-Chat-API.patch
+++ b/CraftBukkit-Patches/0079-BungeeCord-Chat-API.patch
@@ -1,4 +1,4 @@
-From dd8a15766cbb4b207028e1874b9c9e09005b20bc Mon Sep 17 00:00:00 2001
+From a8c81161e0334d82e5f4b0f814b0e9cf71633847 Mon Sep 17 00:00:00 2001
 From: md_5 <git@md-5.net>
 Date: Sat, 13 Dec 2014 03:06:05 +0100
 Subject: [PATCH] BungeeCord Chat API
@@ -206,10 +206,10 @@ index a686aa63a..60dc91231 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index d14b5c38d..93d2ce01d 100644
+index 82c1487db..ea96eab4e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-@@ -24,6 +24,9 @@ import org.bukkit.inventory.meta.BookMeta.Generation;
+@@ -22,6 +22,9 @@ import org.bukkit.inventory.meta.BookMeta;
  
  // Spigot start
  import static org.spigotmc.ValidateUtils.*;
@@ -219,7 +219,7 @@ index d14b5c38d..93d2ce01d 100644
  // Spigot end
  
  @DelegateDeserialization(SerializableMeta.class)
-@@ -439,6 +442,94 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
+@@ -431,6 +434,94 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
      // Spigot start
      private BookMeta.Spigot spigot = new SpigotMeta();
      private class SpigotMeta extends BookMeta.Spigot {