diff --git a/CraftBukkit-Patches/0017-Improved-Timings-System.patch b/CraftBukkit-Patches/0017-Improved-Timings-System.patch
index e2b222032..52223d577 100644
--- a/CraftBukkit-Patches/0017-Improved-Timings-System.patch
+++ b/CraftBukkit-Patches/0017-Improved-Timings-System.patch
@@ -1,4 +1,4 @@
-From 9808bdb02bc1e375a8f809a3b8b553104b242daa Mon Sep 17 00:00:00 2001
+From 37c0d29448613da381e0fafccefd8e1792e2cbfe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Improved Timings System
@@ -13,9 +13,9 @@ Tracks nearly every point of minecraft internals and plugin events to give a goo
  src/main/java/net/minecraft/server/TileEntity.java |   2 +
  src/main/java/net/minecraft/server/World.java      |  17 ++++
  .../java/net/minecraft/server/WorldServer.java     |   4 +
- .../java/org/bukkit/craftbukkit/SpigotTimings.java | 111 +++++++++++++++++++++
+ .../java/org/bukkit/craftbukkit/SpigotTimings.java | 110 +++++++++++++++++++++
  .../bukkit/craftbukkit/scheduler/CraftTask.java    |  18 ++++
- 10 files changed, 190 insertions(+), 1 deletion(-)
+ 10 files changed, 189 insertions(+), 1 deletion(-)
  create mode 100644 src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -407,15 +407,14 @@ index 4aa2a19..6cb3e24 100644
      public BiomeMeta a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 new file mode 100644
-index 0000000..dec3110
+index 0000000..bbb6368
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
-@@ -0,0 +1,111 @@
+@@ -0,0 +1,110 @@
 +package org.bukkit.craftbukkit;
 +
 +import net.minecraft.server.*;
 +import org.bukkit.CustomTimingsHandler;
-+import org.bukkit.plugin.Plugin;
 +import org.bukkit.scheduler.BukkitTask;
 +
 +import java.util.HashMap;
@@ -424,7 +423,7 @@ index 0000000..dec3110
 +
 +    public static final CustomTimingsHandler serverTickTimer = new CustomTimingsHandler("** Full Server Tick");
 +    public static final CustomTimingsHandler playerListTimer = new CustomTimingsHandler("Player List");
-+    public static final CustomTimingsHandler connectionTimer = new CustomTimingsHandler("Connection");
++    public static final CustomTimingsHandler connectionTimer = new CustomTimingsHandler("Player Tick");
 +    public static final CustomTimingsHandler tickablesTimer = new CustomTimingsHandler("Tickables");
 +    public static final CustomTimingsHandler schedulerTimer = new CustomTimingsHandler("Scheduler");
 +    public static final CustomTimingsHandler chunkIOTickTimer = new CustomTimingsHandler("ChunkIOTick");
@@ -567,5 +566,5 @@ index 55db3ff..df134e3 100644
  
      long getPeriod() {
 -- 
-1.8.1.1
+1.8.1-rc2
 
diff --git a/CraftBukkit-Patches/0024-Entity-Activation-Range.patch b/CraftBukkit-Patches/0024-Entity-Activation-Range.patch
index 2838181cd..b6701f438 100644
--- a/CraftBukkit-Patches/0024-Entity-Activation-Range.patch
+++ b/CraftBukkit-Patches/0024-Entity-Activation-Range.patch
@@ -1,4 +1,4 @@
-From 8a22e56519a1b35e512bbb7f80070bcb9e67e9c9 Mon Sep 17 00:00:00 2001
+From 4fb653cd3f94ac7bbd2e0815c89de285db157a09 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Feb 2013 05:10:21 -0500
 Subject: [PATCH] Entity Activation Range
@@ -417,10 +417,10 @@ index ad65bca..79be52d 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
-index dec3110..c4e7dda 100644
+index bbb6368..d8f73ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
-@@ -30,6 +30,9 @@ public class SpigotTimings {
+@@ -29,6 +29,9 @@ public class SpigotTimings {
  
      public static final CustomTimingsHandler playerCommandTimer = new CustomTimingsHandler("** playerCommand");