diff --git a/binaries/data/mods/public/simulation/components/UnitAI.js b/binaries/data/mods/public/simulation/components/UnitAI.js
index cd367f30bd..e87616b724 100644
--- a/binaries/data/mods/public/simulation/components/UnitAI.js
+++ b/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -25,8 +25,9 @@ UnitAI.prototype.Schema =
 					"<value a:help='Will actively attack any unit it encounters, even if not threatened'>violent</value>" +
 					"<value a:help='Will attack nearby units if it feels threatened (if they linger within LOS for too long)'>aggressive</value>" +
 					"<value a:help='Will attack nearby units if attacked'>defensive</value>" +
-					"<value a:help='Will never attack units'>passive</value>" +
+					"<value a:help='Will never attack units but will attempt to flee when attacked'>passive</value>" +
 					"<value a:help='Will never attack units. Will typically attempt to flee for short distances when units approach'>skittish</value>" +
+					"<value a:help='Will never attack units and will not attempt to flee when attacked'>domestic</value>" +
 				"</choice>" +
 			"</element>" +
 			"<element name='RoamDistance'>" +
@@ -1203,6 +1204,10 @@ var UnitFsmSpec = {
 				if (this.CanAttack(msg.data.attacker))
 					this.Attack(msg.data.attacker, false);
 			}
+			else if (this.template.NaturalBehaviour == "domestic")
+			{	// Never flee, stop what we were doing
+				this.SetNextState("IDLE");
+			}
 		},
 
 		"Order.LeaveFoundation": function(msg) {
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
index 54574550e1..e07ace8196 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_passive">
+<Entity parent="template_unit_fauna_herd_domestic">
   <Footprint>
     <Circle radius="0.75"/>
     <Height>1.5</Height>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
index 94bcf95ec5..4afeaa27bc 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_passive">
+<Entity parent="template_unit_fauna_herd_domestic">
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
index 7660032991..3253d6db82 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_muskox.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_passive">
+<Entity parent="template_unit_fauna_herd_domestic">
   <Footprint>
     <Circle radius="1.5"/>
     <Height>2.5</Height>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
index 80a2eb4235..c4d4eccb07 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_passive">
+<Entity parent="template_unit_fauna_herd_domestic">
   <Identity>
     <Civ>gaia</Civ>
     <SpecificName>Pig</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
index 28a24b033b..8e53485077 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_fauna_herd_passive">
+<Entity parent="template_unit_fauna_herd_domestic">
   <Cost>
     <BuildTime>45</BuildTime>
     <Resources>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_passive.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
similarity index 73%
rename from binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_passive.xml
rename to binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
index 15d6927d22..5bfb8ec55d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_passive.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
@@ -3,6 +3,6 @@
   <Identity>
   </Identity>
   <UnitAI>
-    <NaturalBehaviour>passive</NaturalBehaviour>
+    <NaturalBehaviour>domestic</NaturalBehaviour>
   </UnitAI>
 </Entity>