diff --git a/OpenRA.Mods.Common/Graphics/TilesetSpecificSpriteSequence.cs b/OpenRA.Mods.Common/Graphics/TilesetSpecificSpriteSequence.cs
new file mode 100644
index 0000000000..afe0a9fe70
--- /dev/null
+++ b/OpenRA.Mods.Common/Graphics/TilesetSpecificSpriteSequence.cs
@@ -0,0 +1,75 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2015 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. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using OpenRA.Graphics;
+
+namespace OpenRA.Mods.Common.Graphics
+{
+	public class TilesetSpecificSpriteSequenceLoader : DefaultSpriteSequenceLoader
+	{
+		public readonly string DefaultSpriteExtension = ".shp";
+		public readonly Dictionary<string, string> TilesetExtensions = new Dictionary<string, string>();
+
+		public TilesetSpecificSpriteSequenceLoader(ModData modData)
+			: base(modData)
+		{
+			var metadata = modData.Manifest.Get<SpriteSequenceFormat>().Metadata;
+			MiniYaml yaml;
+			if (metadata.TryGetValue("DefaultSpriteExtension", out yaml))
+				DefaultSpriteExtension = yaml.Value;
+
+			if (metadata.TryGetValue("TilesetExtensions", out yaml))
+				TilesetExtensions = yaml.ToDictionary(kv => kv.Value);
+		}
+
+		public override ISpriteSequence CreateSequence(ModData modData, TileSet tileSet, SpriteCache cache, string sequence, string animation, MiniYaml info)
+		{
+			return new TilesetSpecificSpriteSequence(modData, tileSet, cache, this, sequence, animation, info);
+		}
+	}
+
+	public class TilesetSpecificSpriteSequence : DefaultSpriteSequence
+	{
+		public TilesetSpecificSpriteSequence(ModData modData, TileSet tileSet, SpriteCache cache, ISpriteSequenceLoader loader, string sequence, string animation, MiniYaml info)
+			: base(modData, tileSet, cache, loader, sequence, animation, info) { }
+
+		protected override string GetSpriteSrc(ModData modData, TileSet tileSet, string sequence, string animation, string sprite, Dictionary<string, MiniYaml> d)
+		{
+			var loader = (TilesetSpecificSpriteSequenceLoader)Loader;
+
+			var spriteName = sprite ?? sequence;
+			if (LoadField<bool>(d, "AddExtension", true))
+			{
+				var useTilesetExtension = LoadField<bool>(d, "UseTilesetExtension", false);
+				var tsId = tileSet.Id;
+
+				MiniYaml yaml;
+				if (d.TryGetValue("TilesetOverrides", out yaml))
+				{
+					var tsNode = yaml.Nodes.FirstOrDefault(n => n.Key == tsId);
+					if (tsNode != null)
+						tsId = tsNode.Value.Value;
+				}
+
+				string tilesetExtension;
+				if (useTilesetExtension && loader.TilesetExtensions.TryGetValue(tsId, out tilesetExtension))
+					return spriteName + tilesetExtension;
+
+				return spriteName + loader.DefaultSpriteExtension;
+			}
+
+			return spriteName;
+		}
+	}
+}
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 56e8a65815..473322a5ce 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -618,6 +618,7 @@
     <Compile Include="Traits\Render\WithInfantryBody.cs" />
     <Compile Include="UtilityCommands\CheckSequenceSprites.cs" />
     <Compile Include="UtilityCommands\FixClassicTilesets.cs" />
+    <Compile Include="Graphics\TilesetSpecificSpriteSequence.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>