diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 28f6366352..e02f8ca3dc 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/05/30
+	* Fixed status_calc_pc not zero'ing ALL vars it should, allowing certain
+	  bonuses (like effect-on-hit) to stack. [Skotlex]
 	* slaves inherit speed setting will now work regardless of whether the
 	  slave or master has the MD_CANMOVE mode bit. [Skotlex]
 	* Call Slave now invokes slaves on a 5x5 area around master. [Skotlex]
diff --git a/src/map/status.c b/src/map/status.c
index 6d80712cd7..c95524a9b3 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1453,6 +1453,8 @@ int status_calc_pc(struct map_session_data* sd,int first)
 		+ sizeof(sd->reseff)
 		+ sizeof(sd->weapon_coma_ele)
 		+ sizeof(sd->weapon_coma_race)
+		+ sizeof(sd->weapon_atk)
+		+ sizeof(sd->weapon_atk_rate)
 		+ sizeof(sd->arrow_addele) 
 		+ sizeof(sd->arrow_addrace)
 		+ sizeof(sd->arrow_addsize)