diff --git a/Spigot-API-Patches/0008-Check-Paper-versions.patch b/Spigot-API-Patches/0008-Check-Paper-versions.patch
index 738c97bfe1..92841f9d49 100644
--- a/Spigot-API-Patches/0008-Check-Paper-versions.patch
+++ b/Spigot-API-Patches/0008-Check-Paper-versions.patch
@@ -1,11 +1,11 @@
-From 9159553f5801fda15241c4be67595ea5c22ba4e4 Mon Sep 17 00:00:00 2001
+From d9b95019ce4ca79338a34067bd0b6ea22ddd245d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 17:58:01 -0600
 Subject: [PATCH] Check Paper versions
 
 
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index 760d58e..0790f3c 100644
+index 760d58eb..aae605e9 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 @@ -28,6 +28,11 @@ import org.json.simple.JSONObject;
@@ -20,6 +20,15 @@ index 760d58e..0790f3c 100644
  public class VersionCommand extends BukkitCommand {
      public VersionCommand(String name) {
          super(name);
+@@ -151,7 +156,7 @@ public class VersionCommand extends BukkitCommand {
+ 
+     private void sendVersion(CommandSender sender) {
+         if (hasVersion) {
+-            if (System.currentTimeMillis() - lastCheck > 21600000) {
++            if (System.currentTimeMillis() - lastCheck > 7200000) { // Paper - Lower to 2 hours
+                 lastCheck = System.currentTimeMillis();
+                 hasVersion = false;
+             } else {
 @@ -182,24 +187,28 @@ public class VersionCommand extends BukkitCommand {
          }
      }
@@ -139,5 +148,5 @@ index 760d58e..0790f3c 100644
 +    // Paper end
  }
 -- 
-2.9.2.windows.1
+2.11.1.windows.1
 
diff --git a/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index a3b26f6962..325e677333 100644
--- a/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0106-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 538948b090d2c70051bb9d5713c5d175dd24afb5 Mon Sep 17 00:00:00 2001
+From 4b228df11853e75ad2d1c99fccb53c1f786ce270 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -67,10 +67,10 @@ index 540d57855..8cb8cbe2d 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 53fbd38d6..73aee9b0d 100644
+index f65611a6a..9965235ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1264,8 +1264,9 @@ public class CraftWorld implements World {
+@@ -1265,8 +1265,9 @@ public class CraftWorld implements World {
          int chunkCoordX = chunkcoordinates.getX() >> 4;
          int chunkCoordZ = chunkcoordinates.getZ() >> 4;
          // Cycle through the 25x25 Chunks around it to load/unload the chunks.
@@ -83,5 +83,5 @@ index 53fbd38d6..73aee9b0d 100644
                      loadChunk(chunkCoordX + x, chunkCoordZ + z);
                  } else {
 -- 
-2.11.0.windows.3
+2.11.1.windows.1
 
diff --git a/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch b/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch
index 8100a4d677..b4c964125c 100644
--- a/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0145-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@@ -1,4 +1,4 @@
-From ed8e49d8515b58275cf99651811ea92a1704afc1 Mon Sep 17 00:00:00 2001
+From 7c927385a687ca4e9e98a469e751ef27f0a508f7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -127,10 +127,10 @@ index 5b27bd1c5..b163346be 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 73aee9b0d..5a44a9f38 100644
+index 9965235ab..3f8859a1f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1557,7 +1557,7 @@ public class CraftWorld implements World {
+@@ -1558,7 +1558,7 @@ public class CraftWorld implements World {
          ChunkProviderServer cps = world.getChunkProviderServer();
          for (net.minecraft.server.Chunk chunk : cps.chunks.values()) {
              // If in use, skip it
@@ -140,5 +140,5 @@ index 73aee9b0d..5a44a9f38 100644
              }
  
 -- 
-2.11.0
+2.11.1.windows.1
 
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a1d3777d89..3c48711c05 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a1d3777d890b6a9ae20b9450c2af9b373e4d3575
+Subproject commit 3c48711c053bf7c007964f17135c56d6dfe1fda6