diff --git a/OpenRA.Mods.Common/Lint/CheckTargetHealthRadius.cs b/OpenRA.Mods.Common/Lint/CheckTargetHealthRadius.cs
new file mode 100644
index 0000000000..e13081670e
--- /dev/null
+++ b/OpenRA.Mods.Common/Lint/CheckTargetHealthRadius.cs
@@ -0,0 +1,55 @@
+#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.Linq;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.Common.Warheads;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Common.Lint
+{
+	class CheckTargetHealthRadius : ILintRulesPass
+	{
+		public void Run(Action<string> emitError, Action<string> emitWarning, Ruleset rules)
+		{
+			foreach (var actorInfo in rules.Actors)
+			{
+				var healthTraits = actorInfo.Value.TraitInfos<HealthInfo>().ToList();
+				if (!healthTraits.Any())
+					continue;
+
+				var targetable = actorInfo.Value.TraitInfos<ITargetableInfo>().SelectMany(x => x.GetTargetTypes()).ToList();
+				if (!targetable.Any())
+					continue;
+
+				foreach (var weaponInfo in rules.Weapons)
+				{
+					var warheads = weaponInfo.Value.Warheads.OfType<SpreadDamageWarhead>().Where(dw => dw.Damage > 0);
+
+					foreach (var warhead in warheads)
+					{
+						// This is a special warhead, like the one on `weathering` in D2k.
+						if (!warhead.DamageTypes.Any())
+							continue;
+
+						// This warhead cannot affect this actor.
+						if (!warhead.ValidTargets.Overlaps(targetable))
+							continue;
+
+						if (healthTraits.Where(x => x.Radius.Length > warhead.TargetExtraSearchRadius.Length).Any())
+							emitError("Actor type `{0}` has a health radius exceeding the victim scan radius of a warhead on `{1}`!"
+								.F(actorInfo.Key, weaponInfo.Key));
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 8cd4b9ab44..e6e3568a65 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -191,6 +191,7 @@
     <Compile Include="Lint\CheckDeathTypes.cs" />
     <Compile Include="Lint\CheckVoiceReferences.cs" />
     <Compile Include="Lint\CheckUpgrades.cs" />
+    <Compile Include="Lint\CheckTargetHealthRadius.cs" />
     <Compile Include="Lint\LintBuildablePrerequisites.cs" />
     <Compile Include="Lint\LintExts.cs" />
     <Compile Include="LoadScreens\ModChooserLoadScreen.cs" />