diff --git a/CraftBukkit-Patches/0041-Hopper-Cooldowns.patch b/CraftBukkit-Patches/0041-Hopper-Cooldowns.patch
index 04de94b56..9564351df 100644
--- a/CraftBukkit-Patches/0041-Hopper-Cooldowns.patch
+++ b/CraftBukkit-Patches/0041-Hopper-Cooldowns.patch
@@ -1,11 +1,11 @@
-From d79943cc3e104b540bcb4c9739a8092540ee00f9 Mon Sep 17 00:00:00 2001
+From bc75a12a18b4514da4bf4cfaec2b84c829b14424 Mon Sep 17 00:00:00 2001
 From: DerFlash <bte@freenet.de>
 Date: Sun, 2 Jun 2013 16:23:46 +1000
 Subject: [PATCH] Hopper Cooldowns
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 054cea4..37e8f3c 100644
+index 054cea4..6832b13 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -182,16 +182,19 @@ public class TileEntityHopper extends TileEntity implements IHopper {
@@ -50,7 +50,7 @@ index 054cea4..37e8f3c 100644
 +                    ((TileEntityHopper) ihopper).c(ihopper.getWorld().spigotConfig.hopperTransfer); // Spigot
                  } else if (ihopper instanceof EntityMinecartHopper) {
 -                    ((EntityMinecartHopper) ihopper).l(4); // Delay hopper minecart checks
-+                    ((EntityMinecartHopper) ihopper).n(ihopper.getWorld().spigotConfig.hopperTransfer / 2); // Spigot
++                    ((EntityMinecartHopper) ihopper).l(ihopper.getWorld().spigotConfig.hopperTransfer / 2); // Spigot
                  }
  
                  return false;
diff --git a/CraftBukkit-Patches/0058-Add-compile-failsafe.patch b/CraftBukkit-Patches/0058-Add-compile-failsafe.patch
new file mode 100644
index 000000000..4195e3f1c
--- /dev/null
+++ b/CraftBukkit-Patches/0058-Add-compile-failsafe.patch
@@ -0,0 +1,26 @@
+From 097bfc4a82be572a4763d379a25eb62ca2191977 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Tue, 2 Jul 2013 13:45:22 +1000
+Subject: [PATCH] Add compile failsafe
+
+
+diff --git a/pom.xml b/pom.xml
+index 2d8b3f3..cddae7a 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -9,10 +9,10 @@
+     <relativePath>../pom.xml</relativePath>
+   </parent>
+ 
+-  <groupId>org.spigotmc</groupId>
++  <!-- <groupId>org.spigotmc</groupId>
+   <artifactId>spigot</artifactId>
+   <packaging>jar</packaging>
+-  <version>1.6.1-R0.1-SNAPSHOT</version>
++  <version>1.6.1-R0.1-SNAPSHOT</version> Remove to compile Spigot 1.6.1 -->
+   <name>Spigot</name>
+   <url>http://www.spigotmc.org</url>
+ 
+-- 
+1.8.1.2
+