diff --git a/sway/commands/border.c b/sway/commands/border.c
index bfd3b9ed..cc0d635a 100644
--- a/sway/commands/border.c
+++ b/sway/commands/border.c
@@ -81,7 +81,7 @@ struct cmd_results *cmd_border(int argc, char **argv) {
 		border_toggle(view);
 	} else {
 		return cmd_results_new(CMD_INVALID, "border",
-				"Expected 'border <none|normal|pixel|toggle>' "
+				"Expected 'border <none|normal|pixel|csd|toggle>' "
 				"or 'border pixel <px>'");
 	}
 	if (argc == 2) {
diff --git a/sway/sway.5.scd b/sway/sway.5.scd
index 67cc1cb1..3a760d01 100644
--- a/sway/sway.5.scd
+++ b/sway/sway.5.scd
@@ -87,14 +87,15 @@ The following commands may only be used in the configuration file.
 The following commands cannot be used directly in the configuration file.
 They are expected to be used with *bindsym* or at runtime through *swaymsg*(1).
 
-*border* normal|pixel [<n>]
+*border* none|normal|csd|pixel [<n>]
 	Set border style for focused window. _normal_ includes a border of
 	thickness _n_ and a title bar. _pixel_ is a border without title bar _n_
-	pixels thick. Default is _normal_ with border thickness 2.
+	pixels thick. Default is _normal_ with border thickness 2. _csd_ is short
+	for client-side-decorations, which allows the client to draw its own
+	decorations.
 
-*border* none|toggle
-	Set border style for focused window to _none_ or _toggle_ between the
-	available border styles: _normal_, _pixel_, _none_.
+*border* toggle
+	Cycles through the available border styles.
 
 *exit*
 	Exit sway and end your Wayland session.