diff --git a/docs/help/in/knock.in b/docs/help/in/knock.in
index 36100fbf..947e3a8a 100644
--- a/docs/help/in/knock.in
+++ b/docs/help/in/knock.in
@@ -1,5 +1,5 @@
 
-KNOCK %|<channel>
+@SYNTAX:knock@
 
 Works only in some IRC networks (hybrid-like ircds).
 
@@ -8,8 +8,9 @@ KNOCK is a feature that lets you request access to a channel they cannot join wi
 The following conditions must be met for KNOCK to work:
 
  - You are not banned from the channel
- - Channel is not secret (+s)
+ - Channel is not secret (+s) or private (+p)
  - You are not already on the channel
  - Channel is invite only (+i), has a key (+k) or limit is full
 
 When successful KNOCK issued, it sends a notice to channel operators. Use of KNOCK is rate limited by server.
+
diff --git a/src/irc/core/irc-commands.c b/src/irc/core/irc-commands.c
index d0d3b683..107fec70 100644
--- a/src/irc/core/irc-commands.c
+++ b/src/irc/core/irc-commands.c
@@ -1017,6 +1017,8 @@ void irc_commands_init(void)
 	command_bind_irc("admin", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: INFO [<server>] */
 	command_bind_irc("info", NULL, (SIGNAL_FUNC) command_self);
+    /* SYNTAX: KNOCK <channel> */
+    command_bind_irc("knock", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: LINKS [[<server>] <mask>] */
 	command_bind_irc("links", NULL, (SIGNAL_FUNC) command_self);
 	/* SYNTAX: LUSERS [<server mask> [<remote server>]] */
@@ -1108,6 +1110,7 @@ void irc_commands_deinit(void)
 	command_unbind("ison", (SIGNAL_FUNC) command_1self);
 	command_unbind("admin", (SIGNAL_FUNC) command_self);
 	command_unbind("info", (SIGNAL_FUNC) command_self);
+    command_unbind("knock", (SIGNAL_FUNC) command_self);
 	command_unbind("links", (SIGNAL_FUNC) command_self);
 	command_unbind("lusers", (SIGNAL_FUNC) command_self);
 	command_unbind("map", (SIGNAL_FUNC) command_self);