diff --git a/catgirl.1 b/catgirl.1
index a3cec1a..5ec8db1 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -1,4 +1,4 @@
-.Dd March 31, 2020
+.Dd April  6, 2020
 .Dt CATGIRL 1
 .Os
 .
@@ -354,10 +354,10 @@ Switch to window by number.
 .Bl -tag -width Ds
 .It Ic /ban Op Ar mask ...
 List or ban masks from the channel.
-.It Ic /deop Ar nick ...
-Revoke channel operator status from users.
-.It Ic /devoice Ar nick ...
-Revoke voice from users in the channel.
+.It Ic /deop Op Ar nick ...
+Revoke channel operator status from users or yourself.
+.It Ic /devoice Op Ar nick ...
+Revoke voice from users or yourself in the channel.
 .It Ic /except Op Ar mask ...
 List or add masks to the channel ban exception list.
 .It Ic /invex Op Ar mask ...
@@ -370,16 +370,16 @@ In the
 .Sy <network>
 window,
 show or set user modes.
-.It Ic /op Ar nick ...
-Grant users channel operator status.
+.It Ic /op Op Ar nick ...
+Grant users or yourself channel operator status.
 .It Ic /unban Ar mask ...
 Unban masks from the channel.
 .It Ic /unexcept Ar mask ...
 Remove masks from the channel ban exception list.
 .It Ic /uninvex Ar mask ...
 Remove masks from the channel invite list.
-.It Ic /voice Ar nick ...
-Grant users voice in the channel.
+.It Ic /voice Op Ar nick ...
+Grant users or yourself voice in the channel.
 .El
 .
 .Sh KEY BINDINGS
diff --git a/command.c b/command.c
index 91e2d66..b041e41 100644
--- a/command.c
+++ b/command.c
@@ -219,13 +219,15 @@ static void commandDeop(uint id, char *params) {
 }
 
 static void commandVoice(uint id, char *params) {
-	if (!params) return;
-	channelListMode(id, '+', 'v', params);
+	if (params) {
+		channelListMode(id, '+', 'v', params);
+	} else {
+		ircFormat("PRIVMSG ChanServ :VOICE %s\r\n", idNames[id]);
+	}
 }
 
 static void commandDevoice(uint id, char *params) {
-	if (!params) return;
-	channelListMode(id, '-', 'v', params);
+	channelListMode(id, '-', 'v', (params ?: self.nick));
 }
 
 static void commandBan(uint id, char *params) {