diff --git a/doc/lmms.1 b/doc/lmms.1
index 45b657fc1..dff6d1a35 100644
--- a/doc/lmms.1
+++ b/doc/lmms.1
@@ -42,8 +42,14 @@ LMMS features components such as a Song Editor, a Beat+Bassline Editor, a Piano
 .SH OPTIONS
 .IP "\fB\-r, --render\fP \fIproject-file\fP
 Render given file to either a wav\- or ogg\-file. See \fB\-f\fP for details
-.IP "\fB\-o, --output\fP \fIfile\fP
-render into \fIfile\fP
+.IP "\fB\-r, --render-tracks\fP \fIproject-file\fP
+Render each track into a separate wav\- or ogg\-file. See \fB\-f\fP for details
+.IP "\fB\-o, --output\fP \fIpath\fP
+Render into \fIpath\fP
+.br
+For --render, this is interpreted as a file path.
+.br
+For --render-tracks, this is interpreted as a path to an existing directory.
 .IP "\fB\-f, --format\fP \fIformat\fP
 Specify format of render-output where \fIformat\fP is either 'wav' or 'ogg'
 .IP "\fB\-s, --samplerate\fP \fIsamplerate\fP
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 53e767027..d02f8805f 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -127,7 +127,10 @@ void printHelp()
 		"            [ -h ]\n"
 		"            [ <file to load> ]\n\n"
 		"-r, --render <project file>	Render given project file\n"
-		"-o, --output <file>		Render into <file>\n"
+		"    --render-tracks <project>	Render each track to a different file\n"
+		"-o, --output <path>		Render into <path>\n"
+		"				For --render, provide a file path\n"
+		"				For --render-tracks, provide a directory path\n"
 		"-f, --format <format>		Specify format of render-output where\n"
 		"				Format is either 'wav' or 'ogg'.\n"
 		"-s, --samplerate <samplerate>	Specify output samplerate in Hz\n"