diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index 5ce42ea75a..43da8f25d7 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2006/09/07
+	* Changed gvg_short_attack_damage_rate to 80, as leaked X.2 [Vicious]
 2006/09/06
 	* Reverted back the default view/chase range of mobs to 100% since eA now
 	  uses square view areas, like Aegis. [Skotlex]
diff --git a/conf-tmpl/battle/guild.conf b/conf-tmpl/battle/guild.conf
index c63ca79eaf..b5bb29ab94 100644
--- a/conf-tmpl/battle/guild.conf
+++ b/conf-tmpl/battle/guild.conf
@@ -40,7 +40,7 @@ guild_max_castles: 0
 castle_defense_rate: 100
 
 // Melee damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
-gvg_short_attack_damage_rate: 100
+gvg_short_attack_damage_rate: 80
 
 // Ranged damage adjustments (non skills) for WoE battles (Guild Vs Guild) (Note 2)
 gvg_long_attack_damage_rate: 75