diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
index af8e7e0e7..03bc40c5a 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/BehaviorData.xml
@@ -3139,8 +3139,10 @@
         <Modification>
             <WeaponEnableArray value="AP_HotSBanelingLaunchBuilding"/>
             <WeaponEnableArray value="AP_HotSBanelingLaunchBuildingSmall"/>
+            <WeaponEnableArray value="AP_BanelingSeekTargetBuilding"/>
             <WeaponDisableArray value="AP_HotSBanelingLaunch"/>
             <WeaponDisableArray value="AP_HotSBanelingLaunchSmall"/>
+            <WeaponDisableArray value="AP_BanelingSeekTarget"/>
         </Modification>
     </CBehaviorBuff>
     <CBehaviorBuff id="AP_MatrixOverload">
@@ -6957,4 +6959,12 @@
         <Duration value="30"/>
         <TimeScaleSource Value="Global"/>
     </CBehaviorBuff>
+    <CBehaviorBuff id="AP_BanelingSeekingTarget">
+        <InfoFlags index="Hidden" value="1"/>
+        <Duration value="1"/>
+        <Modification>
+            <WeaponDisableArray value="AP_BanelingSeekTarget"/>
+            <WeaponDisableArray value="AP_BanelingSeekTargetBuilding"/>
+        </Modification>
+    </CBehaviorBuff>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
index 34518f2df..e4840cc3c 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/EffectData.xml
@@ -1790,7 +1790,7 @@
         <AttributeBonus index="Massive" value="10"/>
         <Amount value="25"/>
         <Death value="Blast"/>
-        <ValidatorArray value="AP_TargetIsNotGroundOrNotInThorGroundRagne"/>
+        <ValidatorArray value="AP_TargetIsNotGroundOrNotInThorGroundRange"/>
         <SearchFilters value="Air;Self,Player,Ally,Neutral,Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <SearchFlags index="OffsetByUnitRadius" value="0"/>
     </CEffectDamage>
@@ -1831,7 +1831,7 @@
         <AttributeBonus index="Massive" value="10"/>
         <Amount value="40"/>
         <Death value="Blast"/>
-        <ValidatorArray value="AP_TargetIsNotGroundOrNotInThorGroundRagne"/>
+        <ValidatorArray value="AP_TargetIsNotGroundOrNotInThorGroundRange"/>
         <SearchFilters value="Air;Self,Player,Ally,Neutral,Missile,Stasis,Dead,Hidden,Invulnerable"/>
         <SearchFlags index="OffsetByUnitRadius" value="0"/>
     </CEffectDamage>
@@ -16801,4 +16801,19 @@
         <EditorCategories value="Race:Zerg"/>
         <Behavior value="AP_Contaminated"/>
     </CEffectApplyBehavior>
+    <CEffectSet id="AP_BanelingSeekTargetSet">
+        <EffectArray value="AP_BanelingSeekTargetAB"/>
+        <EffectArray value="AP_BanelingSeekTargetIssueOrder"/>
+        <ValidatorArray value="CasterNotHoldingPosition"/>
+    </CEffectSet>
+    <CEffectApplyBehavior id="AP_BanelingSeekTargetAB">
+        <Behavior value="AP_BanelingSeekingTarget"/>
+        <WhichUnit Value="Caster"/>
+    </CEffectApplyBehavior>
+    <CEffectIssueOrder id="AP_BanelingSeekTargetIssueOrder">
+        <EditorCategories value="Race:Zerg"/>
+        <Abil value="attack"/>
+        <Target Value="TargetUnit"/>
+        <WhichUnit Value="Caster"/>
+    </CEffectIssueOrder>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 6c2c55414..a82e6c5ba 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -13835,6 +13835,8 @@
         <BehaviorArray Link="AP_MalignantCreepFix"/>
         <WeaponArray Link="AP_HotSBanelingExplode"/>
         <WeaponArray Link="AP_HotSBanelingExplodeBuilding"/>
+        <WeaponArray Link="AP_BanelingSeekTarget"/>
+        <WeaponArray Link="AP_BanelingSeekTargetBuilding"/>
         <WeaponArray Link="AP_HotSBanelingLaunch"/>
         <WeaponArray Link="AP_HotSBanelingLaunchBuilding"/>
         <CardLayouts>
@@ -14069,6 +14071,8 @@
         <BehaviorArray Link="AP_MalignantCreepFix"/>
         <WeaponArray Link="AP_HotSBanelingExplodeSmall"/>
         <WeaponArray Link="AP_HotSBanelingExplodeBuildingSmall"/>
+        <WeaponArray Link="AP_BanelingSeekTarget"/>
+        <WeaponArray Link="AP_BanelingSeekTargetBuilding"/>
         <WeaponArray Link="AP_HotSBanelingLaunchSmall"/>
         <WeaponArray Link="AP_HotSBanelingLaunchBuildingSmall"/>
         <CardLayouts>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index dce630915..3c70c3e76 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -6500,6 +6500,8 @@
         <Flags index="UpgradeCheat" value="0"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_HotSBanelingLaunch,Options[Disabled]" Value="0"/>
         <EffectArray Operation="Set" Reference="Weapon,AP_HotSBanelingLaunchSmall,Options[Disabled]" Value="0"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_BanelingSeekTarget,Options[Disabled]" Value="0"/>
+        <EffectArray Operation="Set" Reference="Weapon,AP_BanelingSeekTargetBuilding,Options[Disabled]" Value="0"/>
         <EffectArray Operation="Set" Reference="Unit,AP_Baneling,Subtitle" Value="UnitSubtitle/AP_HotSHunter"/>
         <EffectArray Operation="Set" Reference="Unit,AP_BanelingBurrowed,Subtitle" Value="UnitSubtitle/AP_HotSHunter"/>
         <EffectArray Operation="Set" Reference="Unit,AP_HotSSplitterlingMedium,Subtitle" Value="UnitSubtitle/AP_HotSHunter"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index c74483ae0..b31a12926 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -5483,10 +5483,7 @@
         <Negate value="1"/>
         <CombineArray value="AP_ThorGroundRange"/>
     </CValidatorCombine>
-    <CValidatorUnitFilters id="AP_TargetIsNotGround">
-        <Filters value="-;Ground"/>
-    </CValidatorUnitFilters>
-    <CValidatorCombine id="AP_TargetIsNotGroundOrNotInThorGroundRagne">
+    <CValidatorCombine id="AP_TargetIsNotGroundOrNotInThorGroundRange">
         <CombineArray value="AP_TargetIsNotGround"/>
         <CombineArray value="AP_NotInThorGroundRange"/>
     </CValidatorCombine>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
index 6389ab410..1b18aadad 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/WeaponData.xml
@@ -2102,6 +2102,25 @@
         <LegacyOptions index="NoDeceleration" value="1"/>
         <AllowedMovement value="Moving"/>
     </CWeaponLegacy>
+    <CWeaponLegacy id="AP_BanelingSeekTarget">
+        <Options index="Disabled" value="1"/>
+        <Options index="Hidden" value="1"/>
+        <AcquireScanFilters value="-;Structure"/>
+        <MinimumRange value="0.25"/>
+        <Range value="3"/>
+        <Period value="1"/>
+        <DamagePoint value="0"/>
+        <Effect value="AP_BanelingSeekTargetSet"/>
+    </CWeaponLegacy>
+    <CWeaponLegacy id="AP_BanelingSeekTargetBuilding">
+        <Options index="Disabled" value="1"/>
+        <Options index="Hidden" value="1"/>
+        <MinimumRange value="0.25"/>
+        <Range value="3"/>
+        <Period value="1"/>
+        <DamagePoint value="0"/>
+        <Effect value="AP_BanelingSeekTargetSet"/>
+    </CWeaponLegacy>
     <CWeaponLegacy id="AP_HotSBanelingLaunch">
         <EditorCategories value="Race:Zerg"/>
         <Options index="Disabled" value="1"/>