diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 386970d921..c2cd6d473c 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -291,6 +291,7 @@
     <Compile Include="Traits\Buildings\RepairsUnits.cs" />
     <Compile Include="Traits\Buildings\Reservable.cs" />
     <Compile Include="Traits\Burns.cs" />
+    <Compile Include="Traits\ChangesTerrain.cs" />
     <Compile Include="Traits\Health.cs" />
     <Compile Include="Traits\PowerTooltip.cs" />
     <Compile Include="Traits\Render\VeteranProductionIconOverlay.cs" />
diff --git a/OpenRA.Mods.Common/Traits/ChangesTerrain.cs b/OpenRA.Mods.Common/Traits/ChangesTerrain.cs
new file mode 100644
index 0000000000..7c82d7740c
--- /dev/null
+++ b/OpenRA.Mods.Common/Traits/ChangesTerrain.cs
@@ -0,0 +1,50 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2016 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Traits
+{
+	[Desc("Modifies the terrain type underneath the actors location.")]
+	class ChangesTerrainInfo : ITraitInfo, Requires<ImmobileInfo>
+	{
+		[FieldLoader.Require] public readonly string TerrainType = null;
+
+		public object Create(ActorInitializer init) { return new ChangesTerrain(this); }
+	}
+
+	class ChangesTerrain : INotifyAddedToWorld, INotifyRemovedFromWorld
+	{
+		readonly ChangesTerrainInfo info;
+		byte previousTerrain;
+
+		public ChangesTerrain(ChangesTerrainInfo info)
+		{
+			this.info = info;
+		}
+
+		void INotifyAddedToWorld.AddedToWorld(Actor self)
+		{
+			var cell = self.Location;
+			var map = self.World.Map;
+			var terrain = map.Rules.TileSet.GetTerrainIndex(info.TerrainType);
+			previousTerrain = map.CustomTerrain[cell];
+			map.CustomTerrain[cell] = terrain;
+		}
+
+		void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
+		{
+			var cell = self.Location;
+			var map = self.World.Map;
+			map.CustomTerrain[cell] = previousTerrain;
+		}
+	}
+}