diff --git a/doc/lmms.1 b/doc/lmms.1
index dff6d1a35..1b0a1801a 100644
--- a/doc/lmms.1
+++ b/doc/lmms.1
@@ -42,7 +42,7 @@ 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\-r, --render-tracks\fP \fIproject-file\fP
+.IP "\fB\-r, --rendertracks\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
diff --git a/src/core/main.cpp b/src/core/main.cpp
index d02f8805f..6078d4653 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -127,10 +127,10 @@ void printHelp()
 		"            [ -h ]\n"
 		"            [ <file to load> ]\n\n"
 		"-r, --render <project file>	Render given project file\n"
-		"    --render-tracks <project>	Render each track to a different file\n"
+		"    --rendertracks <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"
+		"				For --rendertracks, 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"
@@ -190,7 +190,7 @@ int main( int argc, char * * argv )
 		{
 			coreOnly = true;
 		}
-		else if( arg == "--render-tracks" )
+		else if( arg == "--rendertracks" )
 		{
 			coreOnly = true;
 			renderTracks = true;
@@ -298,7 +298,7 @@ int main( int argc, char * * argv )
 
 			return EXIT_SUCCESS;
 		}
-		else if( arg == "--render" || arg == "-r" || arg == "--render-tracks" )
+		else if( arg == "--render" || arg == "-r" || arg == "--rendertracks" )
 		{
 			++i;