diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a222b8c5e6..22bdb60fc0 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ 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/06/01
+	* Fixed pc_damage setting your canlog_tick even if the damage has no source
+	  (eg: poison, berserk) [Skotlex]
+	* Berserk's aspd bonus now stacks with other aspd bonuses, but is still
+	  affected by Quagmire/Forget-me-not. [Skotlex]
 	* Corrected setting slaves_inherit_mode to not apply to morphosis skills.
 	  [Skotlex]
 	* Corrected pc_setoption to invoke status_calc_pc when getting/removing the
diff --git a/src/map/pc.c b/src/map/pc.c
index 91732ab2a0..f39b6b33aa 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -4510,9 +4510,6 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h
 		skill_rest(sd,0);
 	}
 
-	if(sd->status.pet_id > 0 && sd->pd && battle_config.pet_damage_support)
-		pet_target_check(sd,src,1);
-
 	clif_updatestatus(sd,SP_HP);
 
 	if (sd->battle_status.hp<sd->battle_status.max_hp>>2)
@@ -4526,6 +4523,12 @@ void pc_damage(struct map_session_data *sd,struct block_list *src,unsigned int h
 		}
 	}
 
+	if(!src || src == &sd->bl)
+		return;
+	
+	if(sd->status.pet_id > 0 && sd->pd && battle_config.pet_damage_support)
+		pet_target_check(sd,src,1);
+
 	sd->canlog_tick = gettick();
 	return;
 }
diff --git a/src/map/status.c b/src/map/status.c
index 7dce072f08..4bb09130d1 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -3190,8 +3190,7 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
 		if(sc->data[SC_STAR_COMFORT].timer!=-1)
 			max = sc->data[SC_STAR_COMFORT].val2;
 		if((sc->data[SC_TWOHANDQUICKEN].timer!=-1 ||
-			sc->data[SC_ONEHAND].timer!=-1 ||
-			sc->data[SC_BERSERK].timer!=-1
+			sc->data[SC_ONEHAND].timer!=-1
 			) && max < 30)
 			max = 30;
 		
@@ -3238,6 +3237,9 @@ static short status_calc_aspd_rate(struct block_list *bl, struct status_change *
 			}
 		}
 		aspd_rate -= max;
+
+		if(sc->data[SC_BERSERK].timer!=-1)
+			aspd_rate -= 30; //Stacks with the rest of bonuses.
 	}
 	if(sc->data[i=SC_ASPDPOTION3].timer!=-1 ||
 		sc->data[i=SC_ASPDPOTION2].timer!=-1 ||