diff --git a/catgirl.1 b/catgirl.1
index c7dd091..4d8176f 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -1,4 +1,4 @@
-.Dd February 26, 2019
+.Dd July 2, 2019
 .Dt CATGIRL 1
 .Os
 .
@@ -113,7 +113,7 @@ may be used to abbreviate a command.
 .
 .Ss Chat Commands
 .Bl -tag -width Ds
-.It Ic /join Ar chan
+.It Ic /join Ar chan Op Ar key
 Join a channel.
 .
 .It Ic /me Op Ar action
diff --git a/input.c b/input.c
index bbbc0d3..024941d 100644
--- a/input.c
+++ b/input.c
@@ -42,7 +42,12 @@ typedef void Handler(struct Tag tag, char *params);
 
 static void inputJoin(struct Tag tag, char *params) {
 	char *chan = strsep(&params, " ");
-	ircFmt("JOIN :%s\r\n", chan ? chan : tag.name);
+	char *key = strsep(&params, " ");
+	if (key) {
+		ircFmt("JOIN %s %s\r\n", chan, key);
+	} else {
+		ircFmt("JOIN %s\r\n", chan ? chan : tag.name);
+	}
 }
 
 static void inputMe(struct Tag tag, char *params) {