diff --git a/CraftBukkit-Patches/0025-Netty.patch b/CraftBukkit-Patches/0025-Netty.patch
index 90d11fdfc..7005cb1f6 100644
--- a/CraftBukkit-Patches/0025-Netty.patch
+++ b/CraftBukkit-Patches/0025-Netty.patch
@@ -1,4 +1,4 @@
-From 6f95844e426222e803501d99305d1c91362e5d3b Mon Sep 17 00:00:00 2001
+From 3e4a0e2c62d94464f212de966089589d34eb6f2f Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 14 Feb 2013 17:32:20 +1100
 Subject: [PATCH] Netty
@@ -37,6 +37,7 @@ Subject: [PATCH] Netty
  .../net/minecraft/server/Packet56MapChunkBulk.java |   2 +-
  .../net/minecraft/server/PendingConnection.java    |  13 +-
  .../net/minecraft/server/ThreadCommandReader.java  |   1 +
+ .../net/minecraft/server/ThreadLoginVerifier.java  |   1 +
  .../craftbukkit/scheduler/CraftScheduler.java      |   2 +-
  src/main/java/org/spigotmc/netty/CipherCodec.java  |  65 ++++++
  .../org/spigotmc/netty/NettyNetworkManager.java    | 210 +++++++++++++++++
@@ -46,7 +47,7 @@ Subject: [PATCH] Netty
  .../java/org/spigotmc/netty/PacketEncoder.java     |  43 ++++
  .../java/org/spigotmc/netty/PacketListener.java    | 100 +++++++++
  src/main/java/org/spigotmc/netty/ReadState.java    |  16 ++
- 15 files changed, 871 insertions(+), 9 deletions(-)
+ 16 files changed, 872 insertions(+), 9 deletions(-)
  create mode 100644 src/main/java/org/spigotmc/netty/CipherCodec.java
  create mode 100644 src/main/java/org/spigotmc/netty/NettyNetworkManager.java
  create mode 100644 src/main/java/org/spigotmc/netty/NettyServerConnection.java
@@ -172,6 +173,18 @@ index 64eaa4c..fbf6fe6 100644
          this.server = dedicatedserver;
      }
  
+diff --git a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
+index 58d30eb..e4e5049 100644
+--- a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
++++ b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
+@@ -21,6 +21,7 @@ class ThreadLoginVerifier extends Thread {
+     CraftServer server;
+ 
+     ThreadLoginVerifier(PendingConnection pendingconnection, CraftServer server) {
++        super("Login Verifier Thread");
+         this.server = server;
+         // CraftBukkit end
+         this.pendingConnection = pendingconnection;
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 index 0a5c61a..35badf3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java