diff --git a/doc/lmms.1 b/doc/lmms.1
index f66a56bbf..45b657fc1 100644
--- a/doc/lmms.1
+++ b/doc/lmms.1
@@ -44,17 +44,17 @@ LMMS features components such as a Song Editor, a Beat+Bassline Editor, a Piano
 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\-f, --output-format\fP \fIformat\fP
+.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
 Specify output samplerate in Hz - range is 44100 (default) to 192000
 .IP "\fB\-b, --bitrate\fP \fIbitrate\fP
-Specify output bitrate in kHz (for OGG encoding only), default is 160
+Specify output bitrate in KBit/s (for OGG encoding only), default is 160
 .IP "\fB\-i, --interpolation\fP \fImethod\fP
 Specify interpolation method - possible values are \fIlinear\fP, \fIsincfastest\fP (default), \fIsincmedium\fP, \fIsincbest\fP
 .IP "\fB\-x, --oversampling\fP \fIvalue\fP
 Specify oversampling, possible values: 1, 2 (default), 4, 8
-.IP "\fB\-l, --loop-mode
+.IP "\fB\-l, --loop
 Render the given file as a loop, i.e. stop rendering at exactly the end of the song. Additional silence or reverb tails at the end of the song are not rendered.
 .IP "\fB\-u, --upgrade\fP \fIin\fP \fIout\fP
 Upgrade file \fIin\fP and save as \fIout\fP
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 8b5a3ffb5..d656c2faf 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -127,7 +127,7 @@ void printHelp()
 		"            [ <file to load> ]\n\n"
 		"-r, --render <project file>	Render given project file\n"
 		"-o, --output <file>		Render into <file>\n"
-		"-f, --output-format <format>	Specify format of render-output where\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"
 		"				Range: 44100 (default) to 192000\n"
@@ -143,7 +143,7 @@ void printHelp()
 		"				Possible values: 1, 2, 4, 8\n"
 		"				Default: 2\n"
 		"-a, --float			32bit float bit depth\n"
-		"-l, --loop-mode			Render as a loop\n"
+		"-l, --loop			Render as a loop\n"
 		"-u, --upgrade <in> [out]	Upgrade file <in> and save as <out>\n"
 		"       Standard out is used if no output file is specifed\n"
 		"-d, --dump <in>			Dump XML of compressed file <in>\n"
@@ -303,7 +303,7 @@ int main( int argc, char * * argv )
 			fileToLoad = QString::fromLocal8Bit( argv[i] );
 			renderOut = baseName( fileToLoad ) + ".";
 		}
-		else if( arg == "--loop-mode" || arg == "-l" )
+		else if( arg == "--loop" || arg == "-l" )
 		{
 			renderLoop = true;
 		}