diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
index f07dc42d7..002086717 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
@@ -10,9 +10,12 @@ import com.earth2me.essentials.Mob;
 import com.earth2me.essentials.Mob.MobException;
 import com.earth2me.essentials.TargetBlock;
 import net.minecraft.server.EntitySheep;
+import net.minecraft.server.EntityWolf;
+import net.minecraft.server.PathEntity;
 import org.bukkit.DyeColor;
 import org.bukkit.craftbukkit.entity.CraftSheep;
 import org.bukkit.craftbukkit.entity.CraftSlime;
+import org.bukkit.craftbukkit.entity.CraftWolf;
 
 
 public class Commandspawnmob extends EssentialsCommand
@@ -126,6 +129,20 @@ public class Commandspawnmob extends EssentialsCommand
 				return;
 			}
 		}
+		if (split1.length == 2 && "Wolf".equals(mob.name) && split1[1].equalsIgnoreCase("tamed"))
+		{	
+			EntityWolf wolf = ((CraftWolf)spawned).getHandle();
+			wolf.d(true);
+                        wolf.a((PathEntity) null);
+                        wolf.b(true);
+                        wolf.health = 20;
+                        wolf.a(user.getName());
+                        wolf.world.a(wolf, (byte) 7);
+		}
+		if (split1.length == 2 && "Wolf".equals(mob.name) && split1[1].equalsIgnoreCase("angry"))
+		{
+			((CraftWolf)spawned).setAngry(true);
+		}
 		if (args.length == 2)
 		{
 			int mobCount = Integer.parseInt(args[1]);