diff --git a/Spigot-Server-Patches/Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch b/Spigot-Server-Patches/Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
new file mode 100644
index 0000000000..70b3f7b619
--- /dev/null
+++ b/Spigot-Server-Patches/Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@@ -0,0 +1,26 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Zach Brown <1254957+zachbr@users.noreply.github.com>
+Date: Sat, 12 Nov 2016 23:25:22 -0600
+Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
+
+
+diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
++++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
+@@ -0,0 +0,0 @@ public class ItemMonsterEgg extends Item {
+ 
+                 NBTTagCompound nbttagcompound1 = entity.e(new NBTTagCompound());
+                 UUID uuid = entity.getUniqueID();
+-
+-                nbttagcompound1.a(nbttagcompound.getCompound("EntityTag"));
++                // Paper start - Filter out position and motion information
++                final NBTTagCompound entityTag = nbttagcompound.getCompound("EntityTag");
++                entityTag.remove("Pos");
++                entityTag.remove("Motion");
++                nbttagcompound1.a(entityTag);
++                // Paper end
+                 entity.a(uuid);
+                 entity.f(nbttagcompound1);
+             }
+--
\ No newline at end of file
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh
index c4d6dd50de..13a7d13345 100755
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@@ -63,6 +63,7 @@ import EntityWaterAnimal
 import FileIOThread
 import IHopper
 import ItemBlock
+import ItemMonsterEgg
 import NavigationAbstract
 import NBTTagCompound
 import NBTTagList