diff --git a/mods/d2k/rules/defaults.yaml b/mods/d2k/rules/defaults.yaml
index b6f13cbef3..2fd6ac25fe 100644
--- a/mods/d2k/rules/defaults.yaml
+++ b/mods/d2k/rules/defaults.yaml
@@ -50,6 +50,8 @@
 	UpgradeManager:
 	TemporaryOwnerManager:
 	MustBeDestroyed:
+	AnnounceOnSeen:
+		Notification: EnemyUnitsApproaching
 
 ^Tank:
 	AppearsOnRadar:
@@ -103,6 +105,8 @@
 	UpgradeManager:
 	TemporaryOwnerManager:
 	MustBeDestroyed:
+	AnnounceOnSeen:
+		Notification: EnemyUnitsApproaching
 
 ^Husk:
 	Health:
@@ -232,6 +236,8 @@
 		UpgradeMinEnabledLevel: 1
 	UpgradeManager:
 	MustBeDestroyed:
+	AnnounceOnSeen:
+		Notification: EnemyUnitsApproaching
 	TerrainModifiesDamage:
 		TerrainModifier:
 			Rough: 80
@@ -268,6 +274,8 @@
 		UpgradeTypes: selfheal
 		UpgradeMinEnabledLevel: 1
 	UpgradeManager:
+	AnnounceOnSeen:
+		Notification: EnemyUnitsApproaching
 	RenderUnit:
 
 ^Helicopter:
diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml
index 44ef9c9746..8b844040db 100644
--- a/mods/ra/rules/aircraft.yaml
+++ b/mods/ra/rules/aircraft.yaml
@@ -32,6 +32,7 @@ BADR:
 	-EjectOnDeath:
 	-GpsDot:
 	RejectsOrders:
+	-AnnounceOnSeen:
 
 BADR.Bomber:
 	Inherits: ^Plane
@@ -343,4 +344,5 @@ U2:
 		Offset: -1c43,0,0
 		Interval: 2
 	RejectsOrders:
+	-AnnounceOnSeen:
 
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index 6c1335b167..13bfb762e7 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -81,6 +81,8 @@
 	CaptureNotification:
 		Notification: UnitStolen
 	MustBeDestroyed:
+	AnnounceOnSeen:
+		Notification: EnemyUnitsApproaching
 
 ^Tank:
 	Inherits@1: ^ExistsInWorld
@@ -141,6 +143,8 @@
 		GroundCorpsePalette:
 		WaterCorpseSequence:
 		WaterCorpsePalette:
+	AnnounceOnSeen:
+		Notification: EnemyUnitsApproaching
 
 ^Infantry:
 	Inherits@1: ^ExistsInWorld
@@ -215,6 +219,8 @@
 	Cloneable:
 		Types: Infantry
 	MustBeDestroyed:
+	AnnounceOnSeen:
+		Notification: EnemyUnitsApproaching
 
 ^Ship:
 	Inherits@1: ^ExistsInWorld
@@ -244,6 +250,8 @@
 	Tooltip:
 		GenericName: Ship
 	MustBeDestroyed:
+	AnnounceOnSeen:
+		Notification: EnemyUnitsApproaching
 
 ^Plane:
 	Inherits@1: ^ExistsInWorld
@@ -278,6 +286,8 @@
 		GenericName: Plane
 	WithShadow:
 	MustBeDestroyed:
+	AnnounceOnSeen:
+		Notification: EnemyUnitsApproaching
 
 ^Helicopter:
 	Inherits: ^Plane
@@ -286,6 +296,8 @@
 	GpsDot:
 		String: Helicopter
 	Hovers:
+	AnnounceOnSeen:
+		Notification: EnemyUnitsApproaching
 
 ^Building:
 	Inherits@1: ^ExistsInWorld
diff --git a/mods/ra/rules/player.yaml b/mods/ra/rules/player.yaml
index f0ae82564b..73564642a2 100644
--- a/mods/ra/rules/player.yaml
+++ b/mods/ra/rules/player.yaml
@@ -67,4 +67,5 @@ Player:
 		Name: Unrestricted
 		Prerequisites: techlevel.infonly, techlevel.low, techlevel.medium, techlevel.unrestricted
 	GlobalUpgradeManager:
+	EnemyWatcher: