diff --git a/OpenRa.Game/GameRules/SupportPowerInfo.cs b/OpenRa.Game/GameRules/SupportPowerInfo.cs
index 3bdf86d920..6eb34f32be 100644
--- a/OpenRa.Game/GameRules/SupportPowerInfo.cs
+++ b/OpenRa.Game/GameRules/SupportPowerInfo.cs
@@ -15,5 +15,6 @@ namespace OpenRa.Game.GameRules
 		public readonly string LongDesc = "";
 		public readonly string[] Prerequisite = { };
 		public readonly int TechLevel = -1;
+		public readonly bool GivenAuto = true;
 	}
 }
diff --git a/rules.ini b/rules.ini
index 5a3a64af2d..0f0b948965 100644
--- a/rules.ini
+++ b/rules.ini
@@ -126,23 +126,6 @@ FineDiffControl=no      ; Allow 5 difficulty settings instead of only 3 settings
 MCVUndeploy=yes          ; Allow construction yard to undeploy back into MCV?
 
 
-; ******* Special weapon charge times *******
-; The time (minutes) for recharge of these special weapons.
-
-; This will get replaced by proper sections for each support power. -- chrisf
-
-[Recharge]
-Chrono=7                ; chronosphere
-GPS=8                   ; satellite radar
-IronCurtain=11          ; invulnerability device
-Nuke=13                 ; nuclear missile
-ParaBomb=14             ; parachute bombs
-Paratrooper=7           ; paratroopers
-Saboteur=14             ; para-saboteur
-Sonar=10                ; sonar pulse
-SpyPlane=3              ; recon mission
-
-
 ; ******* Unit Statistics *******
 ; Specifies the characteristics of the various game objects.
 
diff --git a/units.ini b/units.ini
index b339f70a5f..a799760dae 100755
--- a/units.ini
+++ b/units.ini
@@ -776,6 +776,8 @@ LongDesc=A Badger carpet-bombs an area.
 OneShot=yes
 Powered=no
 Image=pbmbicon
+TechLevel=8
+GivenAuto=no
 
 [SonarPulsePower]		; picked up in a crate, or by spy -> spen/syrd
 ChargeTime=10
@@ -784,6 +786,8 @@ LongDesc=Reveals all submarines on the map for a short time.
 OneShot=yes
 Powered=no
 Image=sonricon
+TechLevel=5
+GivenAuto=no
 
 [ChronoshiftPower]		; free with Chronosphere... sortof the point.
 ChargeTime=7
@@ -794,6 +798,7 @@ Image=warpicon
 
 [SpyPlanePower]			; free with first AFLD
 ChargeTime=3
+TechLevel=5
 Description=Spy Plane
 LongDesc=Reveals an area of the map.
 Prerequisite=AFLD