diff --git a/addons/maverick/ACE_GuidanceConfig.hpp b/addons/maverick/ACE_GuidanceConfig.hpp
index 948404b7cce..4360bd4a87d 100644
--- a/addons/maverick/ACE_GuidanceConfig.hpp
+++ b/addons/maverick/ACE_GuidanceConfig.hpp
@@ -2,6 +2,6 @@ class EGVAR(missileguidance,AttackProfiles) {
     class maverick {
         name = "LOAL-DIR";
         nameLocked = "LOBL-DIR";
-        functionName = QEFUNC(missileguidance,attackProfile_DIR);
+        functionName = QEFUNC(missileguidance,attackProfile_LIN);
     };
 };
diff --git a/addons/maverick/CfgAmmo.hpp b/addons/maverick/CfgAmmo.hpp
index 654c1fbe80c..7e66e2edee0 100644
--- a/addons/maverick/CfgAmmo.hpp
+++ b/addons/maverick/CfgAmmo.hpp
@@ -5,6 +5,45 @@ class CfgAmmo {
     };
     class Missile_AGM_02_F: MissileBase {};
 
+    class GVAR(D): Missile_AGM_02_F {
+        author = "Dani (TCVM)";
+        missileLockMaxDistance = 14000;
+        maneuvrability = 0;
+        class ace_missileguidance {
+            enabled = 1;
+
+            pitchRate = 15;
+            yawRate = 15;
+
+            canVanillaLock = 1;
+
+            defaultSeekerType = "Optic";
+            seekerTypes[] = {"Optic"};
+
+            defaultSeekerLockMode = "LOBL";
+            seekerLockModes[] = {"LOBL"};
+
+            defaultNavigationType = "AugmentedProportionalNavigation";
+            navigationTypes[] = { "AugmentedProportionalNavigation" };
+
+            seekLastTargetPos = 1;
+            seekerAngle = 60;
+            seekerAccuracy = 1;
+
+            seekerMinRange = 1;
+            seekerMaxRange = 14000;
+
+            defaultAttackProfile = "maverick";
+            attackProfiles[] = {"maverick"};
+        };
+    };
+
+    class GVAR(G): GVAR(D) {
+        class ace_missileguidance: ace_missileguidance {
+            enabled = 1;
+        };
+    };
+
     class GVAR(L): Missile_AGM_02_F {
         author = "xrufix";
         autoSeekTarget = 0;
@@ -16,9 +55,8 @@ class CfgAmmo {
         class ace_missileguidance {
             enabled = 1;
 
-            minDeflection = 0;
-            maxDeflection = 0.002;
-            incDeflection = 0.001;
+            pitchRate = 15;
+            yawRate = 15;
 
             canVanillaLock = 0;
 
@@ -28,6 +66,9 @@ class CfgAmmo {
             defaultSeekerLockMode = "LOAL";
             seekerLockModes[] = {"LOAL","LOBL"};
 
+            defaultNavigationType = "AugmentedProportionalNavigation";
+            navigationTypes[] = { "AugmentedProportionalNavigation" };
+
             seekLastTargetPos = 1;
             seekerAngle = 60;
             seekerAccuracy = 1;
@@ -49,9 +90,8 @@ class CfgAmmo {
         class ace_missileguidance {
             enabled = 1;
 
-            minDeflection = 0;
-            maxDeflection = 0.002;
-            incDeflection = 0.001;
+            pitchRate = 20;
+            yawRate = 20;
 
             canVanillaLock = 0;
 
@@ -61,6 +101,9 @@ class CfgAmmo {
             defaultSeekerLockMode = "LOAL";
             seekerLockModes[] = {"LOAL"};
 
+            defaultNavigationType = "AugmentedProportionalNavigation";
+            navigationTypes[] = { "AugmentedProportionalNavigation" };
+
             seekLastTargetPos = 1;
             seekerAngle = 40;
             seekerAccuracy = 1;
diff --git a/addons/maverick/CfgMagazines.hpp b/addons/maverick/CfgMagazines.hpp
index 705d52010d2..1e51ede8b01 100644
--- a/addons/maverick/CfgMagazines.hpp
+++ b/addons/maverick/CfgMagazines.hpp
@@ -12,7 +12,71 @@ class CfgMagazines {
 
     class PylonRack_Missile_AGM_02_x1: magazine_Missile_AGM_02_x1 {};
     class PylonRack_Missile_AGM_02_x2: magazine_Missile_AGM_02_x1 {};
+    
+    // Optical Mavericks
+    class GVAR(D_magazine): 6Rnd_Missile_AGM_02_F {
+        ammo = QGVAR(D);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(d_mag_x1);
+    };
+    class GVAR(D_pylonRack_1Rnd): PylonRack_1Rnd_Missile_AGM_02_F {
+        ammo = QGVAR(D);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(d_mag_x1);
+        pylonWeapon = QGVAR(D_Launcher);
+    };
+    class GVAR(D_pylonRack_3Rnd): PylonRack_3Rnd_Missile_AGM_02_F {
+        ammo = QGVAR(D);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(d_mag_x3);
+        pylonWeapon = QGVAR(D_Launcher);
+    };
+
+    class GVAR(G_magazine_x1): magazine_Missile_AGM_02_x1 {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x1);
+    };
+    class GVAR(G_pylonmissile_x1): PylonMissile_Missile_AGM_02_x1 {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x1);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
+    class GVAR(G_pylonmissile_x2): PylonMissile_Missile_AGM_02_x2 {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x2);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
+
+    class GVAR(G_pylonRack_1Rnd): PylonRack_1Rnd_Missile_AGM_02_F {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x1);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
+    class GVAR(G_PylonRack_3Rnd): PylonRack_3Rnd_Missile_AGM_02_F {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x3);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
+    
+    class GVAR(G_PylonRack_x1): PylonRack_Missile_AGM_02_x1 {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x1);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
+    class GVAR(G_PylonRack_x2): PylonRack_Missile_AGM_02_x2 {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x2);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
 
+    // Laser Mavericks
     class GVAR(L_magazine_x1): magazine_Missile_AGM_02_x1 {
         ammo = QGVAR(L);
         author = "xrufix";
diff --git a/addons/maverick/CfgWeapons.hpp b/addons/maverick/CfgWeapons.hpp
index 1c0ae744efe..a60681a3cf1 100644
--- a/addons/maverick/CfgWeapons.hpp
+++ b/addons/maverick/CfgWeapons.hpp
@@ -6,6 +6,22 @@ class CfgWeapons {
     class MissileLauncher: LauncherCore {};
     class Missile_AGM_02_Plane_CAS_01_F: MissileLauncher {};
 
+    class GVAR(D_Launcher): Missile_AGM_02_Plane_CAS_01_F {
+        author = "Dani (TCVM)";
+        displayname = CSTRING(D);
+        magazines[] = {QGVAR(D_magazine), QGVAR(D_pylonRack_1Rnd), QGVAR(D_pylonRack_3Rnd)};
+        weaponLockDelay = 0.1;
+        weaponLockSystem = 2;
+    };
+
+    class GVAR(G_Launcher): weapon_AGM_65Launcher {
+        author = "Dani (TCVM)";
+        displayname = CSTRING(G);
+        magazines[] = {QGVAR(G_magazine_x1), QGVAR(G_pylonmissile_x1), QGVAR(G_pylonmissile_x2), QGVAR(G_pylonRack_1Rnd), QGVAR(G_PylonRack_3Rnd), QGVAR(G_PylonRack_x1), QGVAR(G_PylonRack_x2)};
+        weaponLockDelay = 0.1;
+        weaponLockSystem = 2;
+    };
+
     class GVAR(L_Launcher): weapon_AGM_65Launcher {
         author = "xrufix";
         displayname = CSTRING(L);
diff --git a/addons/maverick/stringtable.xml b/addons/maverick/stringtable.xml
index 6bf1d80e042..60af8c830f8 100644
--- a/addons/maverick/stringtable.xml
+++ b/addons/maverick/stringtable.xml
@@ -111,6 +111,27 @@
                 <Turkish>1x Kh-25ML [ACE]</Turkish>
                 <Spanish>1x Kh-25ML [ACE]</Spanish>
             </Key>
+            <Key ID="STR_ACE_Maverick_d">
+                <English>AGM-65 Maverick D</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_g">
+                <English>AGM-65 Maverick G</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_d_mag_x1">
+                <English>AGM-65 Maverick D [ACE]</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_d_mag_x3">
+                <English>3x AGM-65 Maverick D [ACE]</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_g_mag_x1">
+                <English>AGM-65 Maverick G [ACE]</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_g_mag_x2">
+                <English>2x AGM-65 Maverick G [ACE]</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_g_mag_x3">
+                <English>3x AGM-65 Maverick G [ACE]</English>
+            </Key>
         </Container>
         <Container name="weapons">
             <Key ID="STR_ACE_Maverick_l">