diff --git a/CraftBukkit-Patches/0097-Support-vanilla-s-direction-tag-on-fireballs.patch b/CraftBukkit-Patches/0097-Support-vanilla-s-direction-tag-on-fireballs.patch
new file mode 100644
index 0000000000..79ef1948c2
--- /dev/null
+++ b/CraftBukkit-Patches/0097-Support-vanilla-s-direction-tag-on-fireballs.patch
@@ -0,0 +1,36 @@
+From b8644fa6ff4062eace6b9ccf9c779464e0f5b1e3 Mon Sep 17 00:00:00 2001
+From: Thinkofdeath <thethinkofdeath@gmail.com>
+Date: Sat, 18 Jan 2014 14:27:03 +0000
+Subject: [PATCH] Support vanilla's direction tag on fireballs
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
+index 82da554..d23d178 100644
+--- a/src/main/java/net/minecraft/server/EntityFireball.java
++++ b/src/main/java/net/minecraft/server/EntityFireball.java
+@@ -198,6 +198,8 @@ public abstract class EntityFireball extends Entity {
+         nbttagcompound.setByte("inGround", (byte) (this.i ? 1 : 0));
+         // CraftBukkit - Fix direction being mismapped to invalid variables
+         nbttagcompound.set("power", this.a(new double[] { this.dirX, this.dirY, this.dirZ}));
++        // Spigot - Support vanilla's direction tag
++        nbttagcompound.set("direction", this.a(new double[] { this.motX, this.motY, this.motZ}));
+     }
+ 
+     public void a(NBTTagCompound nbttagcompound) {
+@@ -214,6 +216,13 @@ public abstract class EntityFireball extends Entity {
+             this.dirY = nbttaglist.d(1);
+             this.dirZ = nbttaglist.d(2);
+             // CraftBukkit end
++        } else if (nbttagcompound.hasKeyOfType("direction", 9)) { // Spigot - Support vanilla's direction tag
++            NBTTagList nbttaglist = nbttagcompound.getList("direction", 6);
++
++            this.motX = nbttaglist.d(0);
++            this.motY = nbttaglist.d(1);
++            this.motZ = nbttaglist.d(2);
++
+         } else {
+             this.die();
+         }
+-- 
+1.8.4.msysgit.0
+