diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 8aa1873..2c3b8dc 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -3,6 +3,7 @@ Auto IRC Bot 3.0: Change Log
 
 3.0 Indev
 ===============================================================================
+    * Added events on_cmode and on_umode.
     * Added event on_myinfo for RPL_MYINFO (numeric 004).
     * Raw hooks now take hook names and support multiple hooks. This changes
       rchook_add and rchook_del.
diff --git a/lib/Proto/IRC.pm b/lib/Proto/IRC.pm
index 4f765cf..e8a3528 100644
--- a/lib/Proto/IRC.pm
+++ b/lib/Proto/IRC.pm
@@ -42,6 +42,8 @@ our (%got_001, %botinfo, %botchans, %csprefix, %chanusers, %chanmodes, %cap);
 
 # Events.
 API::Std::event_add('on_capack');
+API::Std::event_add('on_cmode');
+API::Std::event_add('on_umode');
 API::Std::event_add('on_connect');
 API::Std::event_add('on_rcjoin');
 API::Std::event_add('on_ucjoin');
@@ -451,7 +453,9 @@ sub mode {
     if ($ex[2] ne $botinfo{$svr}{nick}) {
         # Set data we'll need later.
         my $chan = $ex[2];
+        $ex[3] =~ s/^://xsm;
         my $modes = $ex[3];
+        my $fmodes = join ' ', @ex[3..$#ex];
         $modes =~ s/^://xsm;
         # Get rid of the useless data, so the mode parser will work smoothly.
         shift @ex; shift @ex; shift @ex; shift @ex;
@@ -528,8 +532,14 @@ sub mode {
                 }
             }   
         }
+        # Trigger on_cmode.
+        API::Std::event_run('on_cmode', ($svr, $chan, $fmodes));
+    }
+    else {
+        # User mode change; trigger on_umode.
+        $ex[3] =~ s/^://xsm;
+        API::Std::event_run('on_umode', ($svr, @ex[3..$#ex]));
     }
-
     return 1;
 }