Use private Bukkit/CraftBukkit fork in the mean time