diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 5bfd47a..a858673 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -3,6 +3,7 @@ Auto IRC Bot 3.0: Change Log
 
 3.0 Indev
 ===============================================================================
+    * Bundle server with \%src in the on_rcjoin event.
     * logchan is now joined automatically.
     * Changed on_notice arguments to: \%src, $target, @msg
     * Clean up shutdown.
diff --git a/lib/Parser/IRC.pm b/lib/Parser/IRC.pm
index 566f9b1..0f38113 100644
--- a/lib/Parser/IRC.pm
+++ b/lib/Parser/IRC.pm
@@ -309,7 +309,8 @@ sub cjoin
 	else {
 		# It isn't. Update chanusers and trigger on_rcjoin.
         $chanusers{$svr}{lc(substr $ex[2], 1)}{$src{nick}} = 1;
-		API::Std::event_run("on_rcjoin", ($svr, \%src, $chan));
+        $src{svr} = $svr;
+		API::Std::event_run("on_rcjoin", (\%src, $chan));
 	}
 	
 	return 1;