diff --git a/common/biomesoplenty/configuration/BOPEntities.java b/common/biomesoplenty/configuration/BOPEntities.java
index 089f494d6..c3b55655b 100644
--- a/common/biomesoplenty/configuration/BOPEntities.java
+++ b/common/biomesoplenty/configuration/BOPEntities.java
@@ -108,7 +108,7 @@ public class BOPEntities {
 		    
 		    if (Biomes.promisedLandForest.isPresent() && Biomes.promisedLandSwamp.isPresent() && Biomes.promisedLandPlains.isPresent())
 			{
-				EntityRegistry.addSpawn(EntityBird.class, 8, 1, 1, EnumCreatureType.ambient, Biomes.promisedLandForest.get(), Biomes.promisedLandSwamp.get(), Biomes.promisedLandPlains.get());
+				EntityRegistry.addSpawn(EntityBird.class, 1, 1, 3, EnumCreatureType.monster, Biomes.promisedLandForest.get(), Biomes.promisedLandSwamp.get(), Biomes.promisedLandPlains.get());
 			}
 		}
 	}
diff --git a/common/biomesoplenty/entities/EntityBird.java b/common/biomesoplenty/entities/EntityBird.java
index 8163b1227..0fdd8ff2a 100644
--- a/common/biomesoplenty/entities/EntityBird.java
+++ b/common/biomesoplenty/entities/EntityBird.java
@@ -77,18 +77,18 @@ public class EntityBird extends EntityFlyingMob
     @Override
     protected String getLivingSound()
     {
-        return "biomesoplenty:mob.wasp.say";
+        return "biomesoplenty:mob.bird.say";
     }
 
     @Override
     protected String getHurtSound()
     {
-        return "biomesoplenty:mob.wasp.hurt";
+        return "biomesoplenty:mob.bird.hurt";
     }
 
     @Override
     protected String getDeathSound()
     {
-        return "biomesoplenty:mob.wasp.hurt";
+        return "biomesoplenty:mob.bird.hurt";
     }
 }
diff --git a/common/biomesoplenty/entities/models/ModelBird.java b/common/biomesoplenty/entities/models/ModelBird.java
index b28a10531..7597893d6 100644
--- a/common/biomesoplenty/entities/models/ModelBird.java
+++ b/common/biomesoplenty/entities/models/ModelBird.java
@@ -122,8 +122,16 @@ public class ModelBird extends ModelBase
   {
     super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
     
-    WingRight.rotateAngleZ = MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.25F;
-    WingLeft.rotateAngleZ = -WingRight.rotateAngleZ;  
+    if (entity.motionY > 0 || (entity.motionX == 0 && entity.motionZ == 0))
+    {
+	    WingRight.rotateAngleZ = MathHelper.cos(f2 * 1.7F) * (float)Math.PI * 0.25F;
+	    WingLeft.rotateAngleZ = -WingRight.rotateAngleZ;  
+    }
+    else
+    {
+	    WingRight.rotateAngleZ = 0;
+	    WingLeft.rotateAngleZ = 0;  
+    }
   }
 
 }
diff --git a/common/biomesoplenty/handlers/SoundHandler.java b/common/biomesoplenty/handlers/SoundHandler.java
index 1578ed8b1..812b41107 100644
--- a/common/biomesoplenty/handlers/SoundHandler.java
+++ b/common/biomesoplenty/handlers/SoundHandler.java
@@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 public class SoundHandler 
 {
 	static String[] recordSoundFiles = { "biomesoplenty:bopdisc.ogg", "biomesoplenty:bopdiscmud.ogg" };
-	static String[] soundFiles = { "biomesoplenty:mob/phantom/say.ogg", "biomesoplenty:mob/phantom/hurt.ogg", "biomesoplenty:mob/phantom/death.ogg", "biomesoplenty:mob/wasp/say.ogg", "biomesoplenty:mob/wasp/hurt.ogg" };
+	static String[] soundFiles = { "biomesoplenty:mob/phantom/say.ogg", "biomesoplenty:mob/phantom/hurt.ogg", "biomesoplenty:mob/phantom/death.ogg", "biomesoplenty:mob/wasp/say.ogg", "biomesoplenty:mob/wasp/hurt.ogg", "biomesoplenty:mob/bird/say.ogg", "biomesoplenty:mob/bird/hurt.ogg" };
 	
 	@SideOnly(Side.CLIENT)
 	@ForgeSubscribe
diff --git a/resources/assets/biomesoplenty/sound/mob/bird/hurt.ogg b/resources/assets/biomesoplenty/sound/mob/bird/hurt.ogg
new file mode 100644
index 000000000..07aceac4d
Binary files /dev/null and b/resources/assets/biomesoplenty/sound/mob/bird/hurt.ogg differ
diff --git a/resources/assets/biomesoplenty/sound/mob/bird/say.ogg b/resources/assets/biomesoplenty/sound/mob/bird/say.ogg
new file mode 100644
index 000000000..249399900
Binary files /dev/null and b/resources/assets/biomesoplenty/sound/mob/bird/say.ogg differ