Index: binaries/data/mods/public/gui/common/tooltips.js
===================================================================
--- binaries/data/mods/public/gui/common/tooltips.js
+++ binaries/data/mods/public/gui/common/tooltips.js
@@ -789,6 +789,30 @@
 	});
 }
 
+function getResourceTrickleTooltip(template)
+{
+	if (!template.resourceTrickle)
+		return "";
+
+	let resCodes = g_ResourceData.GetCodes().filter(res => !!template.resourceTrickle.rates[res]);
+	if (!resCodes.length)
+		return "";
+
+	return sprintf(translate("%(label)s %(details)s"), {
+		"label": headerFont(translate("Resource Trickle:")),
+		"details": sprintf(translate("%(resources)s / %(time)s"), {
+			"resources":
+				resCodes.map(
+					res => sprintf(translate("%(resourceIcon)s %(rate)s"), {
+						"resourceIcon": resourceIcon(res),
+						"rate": template.resourceTrickle.rates[res]
+					})
+				).join("  "),
+			"time": getSecondsString(template.resourceTrickle.interval / 1000)
+		})
+	});
+}
+
 /**
  * @param {Object} template - The entity's template.
  * @return {string} - The resources this entity rewards to a collecter.
@@ -822,30 +846,6 @@
 	});
 }
 
-function getResourceTrickleTooltip(template)
-{
-	if (!template.resourceTrickle)
-		return "";
-
-	let resCodes = g_ResourceData.GetCodes().filter(res => !!template.resourceTrickle.rates[res]);
-	if (!resCodes.length)
-		return "";
-
-	return sprintf(translate("%(label)s %(details)s"), {
-		"label": headerFont(translate("Resource Trickle:")),
-		"details": sprintf(translate("%(resources)s / %(time)s"), {
-			"resources":
-				resCodes.map(
-					res => sprintf(translate("%(resourceIcon)s %(rate)s"), {
-						"resourceIcon": resourceIcon(res),
-						"rate": template.resourceTrickle.rates[res]
-					})
-				).join("  "),
-			"time": getSecondsString(template.resourceTrickle.interval / 1000)
-		})
-	});
-}
-
 function getUpkeepTooltip(template)
 {
 	if (!template.upkeep)
Index: binaries/data/mods/public/gui/session/selection_details.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_details.js
+++ binaries/data/mods/public/gui/session/selection_details.js
@@ -291,6 +291,19 @@
 			"time": Engine.FormatMillisecondsIntoDateStringGMT(entState.repairable.buildTime.timeRemaining * 1000, translateWithContext("countdown format", "m:ss"))
 		}) : "";
 	}
+	// tooltip for buildings that receive resourceTrickle when garrisoned
+	else if (entState.resourceTrickle && entState.garrisonHolder && entState.garrisonHolder.occupiedSlots)
+	{
+		let rates = entState.resourceTrickle.rates;
+		let interval = entState.resourceTrickle.interval;
+		for (let resource in rates)
+		{
+			resourceCarryingIcon.sprite = "stretched:session/icons/resources/population.png";
+			resourceCarryingIcon.tooltip = translate("Resource income / interval: ");
+			resourceCarryingIcon.tooltip +=  ' \n[icon="icon_' + resource + '"] ' + Math.round(rates[resource] * 10) / 10 + " / " + Math.round(interval / 100) / 10 + translateWithContext("seconds", "s");
+			resourceCarryingText.caption = entState.garrisonHolder.occupiedSlots + " / " + entState.garrisonHolder.capacity;
+		}
+	}
 	else
 	{
 		resourceCarryingIcon.hidden = true;
Index: binaries/data/mods/public/simulation/data/auras/structures/corral_garrison.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/structures/corral_garrison.json
+++ binaries/data/mods/public/simulation/data/auras/structures/corral_garrison.json
@@ -1,9 +0,0 @@
-{
-	"type": "garrisonedUnits",
-	"affects": ["Domestic"],
-	"modifications": [
-		{ "value": "ResourceTrickle/Rates/food", "add": 1 }
-	],
-	"auraDescription" : "Garrison domesticated animals within the Corral to enable a slow trickle of food per animal. Pigs, Sheep, and Goats: 1 food/4 seconds. Cattle: 1 food/2 seconds.",
-	"auraName": "Ranching and Corralling"
-}
Index: binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_large.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_large.json
+++ binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_large.json
@@ -0,0 +1,10 @@
+{
+	"type": "garrison",
+	"affects": ["Corral"],
+	"modifications": [
+		{ "value": "ResourceTrickle/Rates/food", "add": 2 }
+	],
+	"auraDescription" : "Garrison within the Corral to gain a slow trickle of +2 food.",
+	"auraName": "Ranching and Corralling",
+	"stackable": true
+}
Index: binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_small.json
===================================================================
--- binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_small.json
+++ binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_small.json
@@ -0,0 +1,10 @@
+{
+	"type": "garrison",
+	"affects": ["Corral"],
+	"modifications": [
+		{ "value": "ResourceTrickle/Rates/food", "add": 1 }
+	],
+	"auraDescription" : "Garrison within the Corral to gain a slow trickle of +1 food.",
+	"auraName": "Ranching and Corralling",
+	"stackable": true
+}
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_passive-defensive">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Attack>
     <Melee>
       <AttackName>Tusks</AttackName>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Auras datatype="tokens">
+    structures/corral_garrison_large
+  </Auras>
   <Footprint>
     <Square width="2.5" depth="5.0"/>
     <Height>5.5</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_passive-defensive_bull">
+  <Auras datatype="tokens">
+    structures/corral_garrison_large
+  </Auras>
   <Attack>
     <Melee>
       <AttackName>Horns</AttackName>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
+  <Auras datatype="tokens">
+    structures/corral_garrison_large
+  </Auras>
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
+  <Auras datatype="tokens">
+    structures/corral_garrison_large
+  </Auras>
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic_cattle">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Cost>
     <BuildTime>60</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.0</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_gazelle.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Footprint>
     <Square width="1.5" depth="3.0"/>
     <Height>3.0</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Cost>
     <BuildTime>30</BuildTime>
     <Resources>
@@ -25,9 +28,6 @@
     <Max>70</Max>
     <MaxGatherers>2</MaxGatherers>
   </ResourceSupply>
-  <ResourceTrickle>
-    <Interval>5000</Interval>
-  </ResourceTrickle>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/goat_select.xml</select>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Auras datatype="tokens">
+    structures/corral_garrison_large
+  </Auras>
   <Footprint>
     <Square width="3.0" depth="6.0"/>
     <Height>4.0</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
@@ -25,9 +28,6 @@
     <Max>150</Max>
     <MaxGatherers>4</MaxGatherers>
   </ResourceSupply>
-  <ResourceTrickle>
-    <Interval>3000</Interval>
-  </ResourceTrickle>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/pig_select.xml</select>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_herd_domestic">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Cost>
     <BuildTime>40</BuildTime>
     <Resources>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>3.0</Height>
Index: binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
+++ binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_fauna_hunt_skittish">
+  <Auras datatype="tokens">
+    structures/corral_garrison_small
+  </Auras>
   <Footprint>
     <Square width="2.0" depth="4.0"/>
     <Height>2.5</Height>
Index: binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_resource">
-  <Auras datatype="tokens">
-    structures/corral_garrison
-  </Auras>
   <Cost>
     <BuildTime>50</BuildTime>
     <Resources>
@@ -28,13 +25,19 @@
   <Identity>
     <GenericName>Corral</GenericName>
     <SelectionGroupName>template_structure_resource_corral</SelectionGroupName>
-    <Tooltip>Raise Domestic Animals for food.</Tooltip>
+    <Tooltip>Raise Domestic Animals for food. Garrison animals to gain a trickle of food at intervals.</Tooltip>
     <VisibleClasses datatype="tokens">Economic Village Corral</VisibleClasses>
     <Icon>structures/corral.png</Icon>
     <Requirements>
       <Techs>phase_village</Techs>
     </Requirements>
   </Identity>
+  <ResourceTrickle>
+    <Rates>
+      <food>0</food>
+    </Rates>
+    <Interval>5000</Interval>
+  </ResourceTrickle>
   <Loot>
     <wood>20</wood>
   </Loot>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
@@ -2,14 +2,8 @@
 <Entity parent="template_unit_fauna_herd">
   <Identity>
     <Classes datatype="tokens">Domestic</Classes>
-    <Tooltip>Kill to gather meat for quick food or garrison in a Corral for a slow food trickle.</Tooltip>
+    <Tooltip>Kill to gather meat for quick food.</Tooltip>
   </Identity>
-  <ResourceTrickle>
-    <Rates>
-      <food>0</food>
-    </Rates>
-    <Interval>4000</Interval>
-  </ResourceTrickle>
   <Vision>
     <Range>6</Range>
   </Vision>
Index: binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
@@ -5,9 +5,6 @@
       <Techs>phase_city</Techs>
     </Requirements>
   </Identity>
-  <ResourceTrickle>
-    <Interval>2000</Interval>
-  </ResourceTrickle>
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/cattle_select.xml</select>