diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 2d6991d..8013630 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -3,6 +3,8 @@ Auto IRC Bot 3.0: Change Log
 
 3.0 Indev
 ===============================================================================
+    * Changed on_cprivmsg arguments to: \%src, $channel, @msg
+    * Changed on_uprivmsg arguments to: \%src, @msg
     * Bug fix: Commands getting Permission denied even with incorrect prefix.
     * Changed command callback arguments to: \%src, @args
     * Bundle server with \%src in the on_rcjoin event.
diff --git a/lib/Parser/IRC.pm b/lib/Parser/IRC.pm
index 92bc607..667eec3 100644
--- a/lib/Parser/IRC.pm
+++ b/lib/Parser/IRC.pm
@@ -577,7 +577,9 @@ sub privmsg
         }
 
 		# Trigger event on_uprivmsg.
-		API::Std::event_run("on_uprivmsg", ($svr, @ex));
+        shift @ex; shift @ex; shift @ex;
+        $ex[0] = substr $ex[0], 1;
+		API::Std::event_run("on_uprivmsg", (\%data, @ex));
 	}
 	else {
 		# It is coming to us in a channel message.
@@ -618,7 +620,10 @@ sub privmsg
         }
 
 		# Trigger event on_cprivmsg.
-		API::Std::event_run("on_cprivmsg", ($svr, @ex));
+        my $target = $ex[2]; delete $data{chan};
+        shift @ex; shift @ex; shift @ex;
+        $ex[0] = substr $ex[0], 1;
+		API::Std::event_run("on_cprivmsg", (\%data, $target, @ex));
 	}
 	
 	return 1;