diff --git a/CraftBukkit-Patches/0039-Save-entity-counts-for-randomly-spawned-creatures-to.patch b/CraftBukkit-Patches/0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch
similarity index 97%
rename from CraftBukkit-Patches/0039-Save-entity-counts-for-randomly-spawned-creatures-to.patch
rename to CraftBukkit-Patches/0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch
index 67d11cb79..660e02e91 100644
--- a/CraftBukkit-Patches/0039-Save-entity-counts-for-randomly-spawned-creatures-to.patch
+++ b/CraftBukkit-Patches/0038-Save-entity-counts-for-randomly-spawned-creatures-to.patch
@@ -1,4 +1,4 @@
-From f40950506177bd7115bfacfbb892e698e1ea7775 Mon Sep 17 00:00:00 2001
+From 22a4dd8388a22d36b13e0a6d63c8802489647335 Mon Sep 17 00:00:00 2001
 From: Ammar Askar <ammar@ammaraskar.com>
 Date: Sat, 20 Apr 2013 12:26:20 +0500
 Subject: [PATCH] Save entity counts for randomly spawned creatures to avoid
diff --git a/CraftBukkit-Patches/0038-Snapshot-Protocol.patch b/CraftBukkit-Patches/0038-Snapshot-Protocol.patch.disabled
similarity index 100%
rename from CraftBukkit-Patches/0038-Snapshot-Protocol.patch
rename to CraftBukkit-Patches/0038-Snapshot-Protocol.patch.disabled
diff --git a/CraftBukkit-Patches/0040-Thread-Naming-and-Tweaks.patch b/CraftBukkit-Patches/0039-Thread-Naming-and-Tweaks.patch
similarity index 97%
rename from CraftBukkit-Patches/0040-Thread-Naming-and-Tweaks.patch
rename to CraftBukkit-Patches/0039-Thread-Naming-and-Tweaks.patch
index 523289100..b916e611a 100644
--- a/CraftBukkit-Patches/0040-Thread-Naming-and-Tweaks.patch
+++ b/CraftBukkit-Patches/0039-Thread-Naming-and-Tweaks.patch
@@ -1,4 +1,4 @@
-From 3d9bd6d6fb82c74bb15ad01e32e1908615e5f8ed Mon Sep 17 00:00:00 2001
+From 26d813326fc2c7c59b2037a2b1de8b3d3db0b660 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 23 Apr 2013 11:50:27 +1000
 Subject: [PATCH] Thread Naming and Tweaks
@@ -31,7 +31,7 @@ index 489e184..bfd219c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ThreadLoginVerifier.java b/src/main/java/net/minecraft/server/ThreadLoginVerifier.java
-index 9ed3db5..4a8078e 100644
+index fb4ec7b..c15efc5 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 {