diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 408a6227be..0610ec5ea9 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,9 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2006/07/15
+	* Small change in conf/battle/player.conf to say that 199 is max aspd allowed
+	  (Haplo says that there are many reports of having over 200 is giving errors) [Evera]
 2006/07/13
 	* Kaahi no longer shows the heal effect to everyone. [Skotlex]
 	* Eska no will cause defense to change randomly every second. [Skotlex]
diff --git a/conf-tmpl/battle/player.conf b/conf-tmpl/battle/player.conf
index a9af4dc739..625ee2f6ac 100644
--- a/conf-tmpl/battle/player.conf
+++ b/conf-tmpl/battle/player.conf
@@ -82,7 +82,7 @@ natural_heal_skill_interval: 10000
 // The maximum weight for a character to carry when the character stops healing naturally. (in %)
 natural_heal_weight_rate: 50
 
-// Maximum atk speed. (Default is 190)
+// Maximum atk speed. (Default 190, Highest allowed 199)
 max_aspd: 190
 
 // Maximum walk speed rate (200 would be capped to twice the normal speed)