diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
index dcfc22e051..6f1496e85b 100644
--- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
@@ -253,6 +253,11 @@ public class EntityTrackerEntry {
                         }
                     }
 
+                    // CraftBukkit start - Fix for nonsensical head yaw
+                    this.i = MathHelper.d(this.tracker.ar() * 256.0F / 360.0F);
+                    this.broadcast(new Packet35EntityHeadRotation(this.tracker.id, (byte) i));
+                    // CraftBukkit end
+
                     if (this.tracker instanceof EntityLiving) {
                         EntityLiving entityliving = (EntityLiving) this.tracker;
                         Iterator iterator = entityliving.getEffects().iterator();