diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 442713d..b8607aa 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -3,6 +3,7 @@ Auto IRC Bot 3.0: Change Log
 
 3.0 Indev
 ==================================================================
+    * Update chanusers on JOIN.
     * Properly parse NICK and update chanusers.
     * Added --enable-ssl to ./install for the future SSL support.
     * Added chanstatus-based permissions. This works via
diff --git a/src/Parser/IRC.pm b/src/Parser/IRC.pm
index 9a685a4..855132a 100644
--- a/src/Parser/IRC.pm
+++ b/src/Parser/IRC.pm
@@ -318,7 +318,8 @@ sub cjoin
 		API::Std::event_run("on_ucjoin", ($svr, substr($ex[2], 1)));
 	}
 	else {
-		# It isn't. Trigger on_rcjoin.
+		# It isn't. Update chanusers and trigger on_rcjoin.
+        $chanusers{$svr}{substr($ex[2], 1)}{$src{nick}} = 1;
 		API::Std::event_run("on_rcjoin", ($svr, %src, substr($ex[2], 1)));
 	}