Index: binaries/data/mods/public/simulation/components/Gate.js
===================================================================
--- binaries/data/mods/public/simulation/components/Gate.js
+++ binaries/data/mods/public/simulation/components/Gate.js
@@ -15,6 +15,7 @@
 Gate.prototype.Init = function()
 {
 	this.allies = [];
+	this.garrisoned = [];
 	this.opened = false;
 	this.locked = false;
 };
@@ -40,6 +41,33 @@
 	}
 };
 
+Gate.prototype.OnGarrisonedUnitsChanged = function(msg)
+{
+	for (let entity of msg.added)
+	{
+		this.garrisoned.push(entity);
+
+		let cmpObstruction = Engine.QueryInterface(entity, IID_Obstruction)
+		if (!cmpObstruction)
+			continue;
+
+		// Disable 'block movement' and 'block pathfinding'
+		cmpObstruction.SetDisableBlockMovementPathfinding(true, true, -1);
+	}
+	for (let entity of msg.removed)
+	{
+		this.garrisoned.splice(this.garrisoned.indexOf(entity), 1);
+
+		let cmpObstruction = Engine.QueryInterface(entity, IID_Obstruction)
+		if (!cmpObstruction)
+			continue;
+
+		// Enable 'block movement' and 'block pathfinding'
+		cmpObstruction.SetDisableBlockMovementPathfinding(false, false, -1);
+	}
+	this.OperateGate();
+}
+
 /**
  * Cleanup on destroy
  */
@@ -123,9 +151,9 @@
 		this.timer = undefined;
 	}
 
-	if (this.opened && (this.allies.length == 0 || this.locked))
+	if (this.opened && (this.locked || this.allies.every(entity => this.garrisoned.indexOf(entity) != -1)))
 		this.CloseGate();
-	else if (!this.opened && this.allies.length)
+	else if (!this.opened && this.allies.some(entity => this.garrisoned.indexOf(entity) == -1))
 		this.OpenGate();
 };
 
@@ -221,7 +249,7 @@
 
 	// The gate can't be closed if there are entities colliding with it.
 	var collisions = cmpObstruction.GetEntitiesBlockingConstruction();
-	if (collisions.length)
+	if (collisions.some(entity => this.garrisoned.indexOf(entity) == -1))
 	{
 		if (!this.timer)
 		{
Index: binaries/data/mods/public/simulation/templates/structures/iber_wall_gate.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_wall_gate.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_wall_gate.xml
@@ -4,6 +4,25 @@
     <Square width="37.0" depth="9.5"/>
     <Height>9.0</Height>
   </Footprint>
+  <GarrisonHolder>
+    <Max>3</Max>
+    <List datatype="tokens">Ranged+Infantry</List>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
+    <VisibleGarrisonPoints>
+      <Archer1>
+        <X>0</X><Y>11.5</Y><Z>0</Z>
+      </Archer1>
+      <Archer2>
+        <X>4</X><Y>11.5</Y><Z>0</Z>
+      </Archer2>
+      <Archer3>
+        <X>-4</X><Y>11.5</Y><Z>0</Z>
+      </Archer3>
+    </VisibleGarrisonPoints>
+  </GarrisonHolder>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Biko Sarbide</SpecificName>
@@ -15,6 +34,7 @@
       <Door width="16.0" depth="8.5" x="0" z="0"/>
     </Obstructions>
   </Obstruction>
+  <RallyPoint/>
   <VisualActor>
     <Actor>structures/iberians/wall_gate.xml</Actor>
   </VisualActor>