diff --git a/binaries/data/mods/public/simulation/components/Health.js b/binaries/data/mods/public/simulation/components/Health.js
index bbbd295136..6be516eba1 100644
--- a/binaries/data/mods/public/simulation/components/Health.js
+++ b/binaries/data/mods/public/simulation/components/Health.js
@@ -15,6 +15,11 @@ Health.prototype.Schema =
 			"<data type='positiveInteger'/>" +
 		"</element>" +
 	"</optional>" +
+	"<optional>" +
+		"<element name='SpawnEntityOnDeath' a:help='Entity template to spawn when this entity dies. Note: this is different than the corpse, which retains the original entity&apos;s appearance'>" +
+			"<text/>" +
+		"</element>" +
+	"</optional>" +
 	"<element name='RegenRate' a:help='Hitpoint regeneration rate per second. Not yet implemented'>" +
 		"<ref name='nonNegativeDecimal'/>" +
 	"</element>" +
@@ -112,9 +117,13 @@ Health.prototype.Reduce = function(amount)
 		if (this.hitpoints)
 		{
 			state.killed = true;
-			
+
 			PlaySound("death", this.entity);
 
+			// If SpawnEntityOnDeath is set, spawn the entity
+			if(this.template.SpawnEntityOnDeath)
+				this.CreateDeathSpawnedEntity();
+
 			if (this.template.DeathType == "corpse")
 			{
 				this.CreateCorpse();
@@ -134,7 +143,7 @@ Health.prototype.Reduce = function(amount)
 
 			var old = this.hitpoints;
 			this.hitpoints = 0;
-			
+
 			Engine.PostMessage(this.entity, MT_HealthChanged, { "from": old, "to": this.hitpoints });
 		}
 
@@ -210,6 +219,28 @@ Health.prototype.CreateCorpse = function(leaveResources)
 	return corpse;
 };
 
+Health.prototype.CreateDeathSpawnedEntity = function()
+{
+	// If the unit died while not in the world, don't spawn a death entity for it
+	// since there's nowhere for it to be placed
+	var cmpPosition = Engine.QueryInterface(this.entity, IID_Position);
+	if (!cmpPosition.IsInWorld())
+		return INVALID_ENTITY;
+
+	// Create SpawnEntityOnDeath entity
+	var spawnedEntity = Engine.AddLocalEntity(this.template.SpawnEntityOnDeath);
+
+	// Move to same position
+	var cmpSpawnedPosition = Engine.QueryInterface(spawnedEntity, IID_Position);
+	var pos = cmpPosition.GetPosition();
+	cmpSpawnedPosition.JumpTo(pos.x, pos.z);
+	var rot = cmpPosition.GetRotation();
+	cmpSpawnedPosition.SetYRotation(rot.y);
+	cmpSpawnedPosition.SetXZRotation(rot.x, rot.z);
+
+	return spawnedEntity;
+};
+
 Health.prototype.Repair = function(builderEnt, work)
 {
 	var damage = this.GetMaxHitpoints() - this.GetHitpoints();
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_1x1.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_1x1.xml
new file mode 100644
index 0000000000..1e8da645e9
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_1x1.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_1x1.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_1x1pal.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_1x1pal.xml
new file mode 100644
index 0000000000..ab2b919461
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_1x1pal.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_1x1pal.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_1x3pal.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_1x3pal.xml
new file mode 100644
index 0000000000..3cc0e7bb15
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_1x3pal.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_1x3pal.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_2x2.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_2x2.xml
new file mode 100644
index 0000000000..d52f4aa9da
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_2x2.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_2x2.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_2x4.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_2x4.xml
new file mode 100644
index 0000000000..b7fb01d0f3
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_2x4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_2x4.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_3x3.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_3x3.xml
new file mode 100644
index 0000000000..3098035ba7
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_3x3.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_3x3.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_3x6.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_3x6.xml
new file mode 100644
index 0000000000..15d3555c4d
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_3x6.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_3x6.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_4x2.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_4x2.xml
new file mode 100644
index 0000000000..95001be9ef
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_4x2.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_4x2.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_4x4.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_4x4.xml
new file mode 100644
index 0000000000..e719411588
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_4x4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_4x4.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_4x4_dock.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_4x4_dock.xml
new file mode 100644
index 0000000000..8065369cc2
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_4x4_dock.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_4x4_dock.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_4x6.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_4x6.xml
new file mode 100644
index 0000000000..2c437a9ff8
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_4x6.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_4x6.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_5x5.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_5x5.xml
new file mode 100644
index 0000000000..f75c81d05d
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_5x5.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_5x5.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_6x4.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_6x4.xml
new file mode 100644
index 0000000000..1659ccfde6
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_6x4.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_6x4.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_6x4_dock.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_6x4_dock.xml
new file mode 100644
index 0000000000..140de62204
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_6x4_dock.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_6x4_dock.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_6x6.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_6x6.xml
new file mode 100644
index 0000000000..a8c369a721
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_6x6.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_6x6.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_8x8.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_8x8.xml
new file mode 100644
index 0000000000..33d3f73e43
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_8x8.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_8x8.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_wall.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_wall.xml
new file mode 100644
index 0000000000..06f423d314
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_wall.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_rubble">
+	<VisualActor>
+		<Actor>structures/fndn_wall.xml</Actor>
+	</VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_rubble.xml b/binaries/data/mods/public/simulation/templates/template_rubble.xml
new file mode 100644
index 0000000000..280a1b1e8f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/template_rubble.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+  <Decay>
+    <DelayTime>10.0</DelayTime>
+    <SinkRate>0.2</SinkRate>
+    <SinkAccel>0</SinkAccel>
+  </Decay>
+  <Position>
+    <Altitude>0</Altitude>
+    <Anchor>upright</Anchor>
+    <Floating>false</Floating>
+    <TurnRate>6.0</TurnRate>
+  </Position>
+  <Vision>
+    <Range>0</Range>
+    <RetainInFog>true</RetainInFog>
+    <AlwaysVisible>false</AlwaysVisible>
+  </Vision>
+  <VisualActor>
+    <Actor>structures/fndn_1x1.xml</Actor>
+    <SilhouetteDisplay>false</SilhouetteDisplay>
+    <SilhouetteOccluder>false</SilhouetteOccluder>
+  </VisualActor>
+</Entity>
\ No newline at end of file