diff --git a/docs/USERGUIDE.md b/docs/USERGUIDE.md
index d94d3b44..9817ce5a 100644
--- a/docs/USERGUIDE.md
+++ b/docs/USERGUIDE.md
@@ -96,7 +96,7 @@ By default, if you lose your connection to the IRC server, you are no longer pre
 
 # Multiclient
 
-Oragono natively supports attaching multiple clients to the same nickname (this normally requires the use of an external bouncer, like ZNC or Weechat's "relay" functionality). To use this feature, simply authenticate with SASL (or the PASS workaround, if necessary) when connecting. In the recommended configuration of Oragono, you will receive the nickname associated with your account, even if you have other clients already using it.
+Oragono natively supports attaching multiple clients to the same nickname (this normally requires the use of an external bouncer, like ZNC or WeeChat's "relay" functionality). To use this feature, simply authenticate with SASL (or the PASS workaround, if necessary) when connecting. In the recommended configuration of Oragono, you will receive the nickname associated with your account, even if you have other clients already using it.
 
 # History
 
diff --git a/irc/handlers.go b/irc/handlers.go
index 110dfe20..7443e250 100644
--- a/irc/handlers.go
+++ b/irc/handlers.go
@@ -485,7 +485,7 @@ func capHandler(server *Server, client *Client, msg ircmsg.IrcMessage, rb *Respo
 	sendCapLines := func(cset *caps.Set, values caps.Values) {
 		version := rb.session.capVersion
 		// we're working around two bugs:
-		// 1. weechat 1.4 won't accept the CAP reply unless it contains the server.name source
+		// 1. WeeChat 1.4 won't accept the CAP reply unless it contains the server.name source
 		// 2. old versions of Kiwi and The Lounge can't parse multiline CAP LS 302 (#661),
 		// so try as hard as possible to get the response to fit on one line.
 		// :server.name CAP * LS * :<tokens>