Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -4,7 +4,14 @@
     <Melee>
       <Hack>6.0</Hack>
       <Pierce>13.0</Pierce>
-      <RepeatTime>3500</RepeatTime>
+      <PrepareTime>500</PrepareTime>
+      <RepeatTime>3000</RepeatTime>
+      <Bonuses>
+        <BonusCavMelee>
+          <Classes>Cavalry</Classes>
+          <Multiplier>1.25</Multiplier>
+        </BonusCavMelee>
+      </Bonuses>
     </Melee>
   </Attack>
   <Cost>
@@ -18,9 +25,9 @@
     <History>This was the weapon of choice from horseback. This was the unit that would eventually evolve to the medieval knight (after heavy influence by the Sarmartians and their lances). Infantry were an easy kill; just ride them down and skewer them with your stick and its point on the end. As with all cavalry - it was only the rich and the nobles who were able to fight from horseback due to the cost of owning such a beast.</History>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>22.0</WalkSpeed>
+    <WalkSpeed>20.0</WalkSpeed>
     <Run>
-      <Speed>40.0</Speed>
+      <Speed>28.75</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -29,9 +29,9 @@
     <metal>5</metal>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>20.0</WalkSpeed>
+    <WalkSpeed>21.0</WalkSpeed>
     <Run>
-      <Speed>28.75</Speed>
+      <Speed>30.0</Speed>
       <Range>600.0</Range>
       <RangeMin>5.0</RangeMin>
     </Run>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -11,7 +11,13 @@
       <Crush>0.0</Crush>
       <MaxRange>5.0</MaxRange>
       <PrepareTime>500</PrepareTime>
-      <RepeatTime>3500</RepeatTime>
+      <RepeatTime>3000</RepeatTime>
+      <Bonuses>
+        <BonusCavMelee>
+          <Classes>Cavalry</Classes>
+          <Multiplier>1.25</Multiplier>
+        </BonusCavMelee>
+      </Bonuses>
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
@@ -28,7 +34,7 @@
     <GenericName>Champion Cavalry Spearman</GenericName>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>25.0</WalkSpeed>
+    <WalkSpeed>23.0</WalkSpeed>
     <Run>
       <Speed>40.0</Speed>
     </Run>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -29,7 +29,7 @@
     <GenericName>Champion Cavalry Swordsman</GenericName>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>23.0</WalkSpeed>
+    <WalkSpeed>24.0</WalkSpeed>
     <Run>
       <Speed>40.0</Speed>
     </Run>