diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 6fa8f87d25..e0ba598681 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -33,6 +33,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
                     if (entity instanceof EntityChicken) { return new CraftChicken( server, (EntityChicken) entity); }
                     else if (entity instanceof EntityCow) { return new CraftCow( server, (EntityCow) entity); }
                     else if (entity instanceof EntityPig) { return new CraftPig( server, (EntityPig) entity); }
+                    else if (entity instanceof EntityWolf) { return new CraftWolf( server, (EntityWolf) entity); }
                     else if (entity instanceof EntitySheep) { return new CraftSheep( server, (EntitySheep) entity); }
                     else  { return new CraftAnimals( server, (EntityAnimal) entity); }
                 }
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
new file mode 100644
index 0000000000..1a6e59741b
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWolf.java
@@ -0,0 +1,38 @@
+
+package org.bukkit.craftbukkit.entity;
+
+import net.minecraft.server.EntityWolf;
+import org.bukkit.craftbukkit.CraftServer;
+import org.bukkit.entity.Wolf;
+
+public class CraftWolf extends CraftAnimals implements Wolf {
+    public CraftWolf(CraftServer server, EntityWolf wolf) {
+        super(server, wolf);
+    }
+
+    public boolean isAngry() {
+        return getHandle().x();
+    }
+
+    public void setAngry(boolean angry) {
+        getHandle().c(angry);
+    }
+
+    public boolean isSitting() {
+        return getHandle().y();
+    }
+
+    public void setSitting(boolean sitting) {
+        getHandle().d(sitting);
+    }
+
+    @Override
+    public EntityWolf getHandle() {
+        return (EntityWolf) entity;
+    }
+
+    @Override
+    public String toString() {
+        return "CraftWolf[anger=" + isAngry() + ",owner=" + getTarget() + "]";
+    }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index e419dc0b9c..2983221b1f 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -16,6 +16,7 @@ import net.minecraft.server.EntitySkeleton;
 import net.minecraft.server.EntitySlime;
 import net.minecraft.server.EntitySpider;
 import net.minecraft.server.EntitySquid;
+import net.minecraft.server.EntityWolf;
 import net.minecraft.server.EntityZombie;
 import net.minecraft.server.Item;
 import net.minecraft.server.ItemStack;
@@ -200,6 +201,8 @@ public class CraftEventFactory {
             type = CreatureType.GHAST;
         } else if (entityliving instanceof EntityGiantZombie) {
             type = CreatureType.GIANT;
+        } else if (entityliving instanceof EntityWolf) {
+            type = CreatureType.WOLF;
         } else if (entityliving instanceof EntityPig) {
             type = CreatureType.PIG;
         } else if (entityliving instanceof EntityPigZombie) {