diff --git a/desmume/src/cli/doc/desmume-cli.1 b/desmume/src/cli/doc/desmume-cli.1
index cad9cf47a..29d2e406d 100644
--- a/desmume/src/cli/doc/desmume-cli.1
+++ b/desmume/src/cli/doc/desmume-cli.1
@@ -33,13 +33,9 @@ program
 These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
 A summary of options is included below.
-For a complete description, see the Info files.
 .TP
-.B \-\-opengl-2d
-Enables using OpenGL for screen rendering
-.TP
-.B \-\-soft-convert
-Use software colour conversion during OpenGL screen rendering. May produce better or worse frame rates depending on hardware.
+.B \-\-load-slot=NUM
+Loads savegame from slot NUM
 .TP
 .B \-\-disable-sound
 Disables the sound emulation
@@ -47,20 +43,58 @@ Disables the sound emulation
 .B \-\-disable-limiter
 Disables the 60 fps limiter
 .TP
+.B \-\-3d-engine=ENGINE
+Enables software 3d rasterizer, available ENGINES:
+.RS
+0 = 3d disabled - default
+.RE
+.RS
+1 = internal desmume software rasterizer
+.RE
+.TP
+.B \-\-opengl-2d
+Enables using OpenGL for screen rendering
+.TP
+.B \-\-soft-convert
+Use software colour conversion during OpenGL screen rendering. May produce better or worse frame rates depending on hardware.
+.TP
 .B \-\-arm9gdb=PORT_NUM
 Enable the ARM9 GDB stub on the given port
 .TP
 .B \-\-arm7gdb=PORT_NUM
 Enable the ARM7 GDB stub on the given port
 .TP
+.B \-\-fwlang=LANG
+Set the language in the firmware, LANG as follows:
+.RS
+0 = Japanese
+.RE
+.RS
+1 = English
+.RE
+.RS
+2 = French
+.RE
+.RS
+3 = German
+.RE
+.RS
+4 = Italian
+.RE
+.RS
+5 = Spanish
+.RE
+.TP
 .B \-\-cflash=PATH_TO_DISK_IMAGE
 Enable disk image GBAMP compact flash emulation
 .TP
-.B \-h, \-\-help
+.B \-\-help
 Show summary of options.
 .TP
-.B \-v, \-\-version
+.B \-\-version
 Show version of program.
+.PP
+Some options may be unavailable, depending on compile-time configuration, for instance gdb stubs and opengl.
 .SH SEE ALSO
 .BR undocumented (7)
 .br
diff --git a/desmume/src/cli/main.cpp b/desmume/src/cli/main.cpp
index b8a8da8ef..cfab60d74 100644
--- a/desmume/src/cli/main.cpp
+++ b/desmume/src/cli/main.cpp
@@ -166,7 +166,7 @@ fill_config( struct my_config *config,
     if ( strcmp( argv[i], "--help") == 0) {
       printf( "USAGE: %s [options] <nds-file>\n", argv[0]);
       printf( "OPTIONS:\n");
-      printf( "   --load-slot=<n>     Loads savegame from slot n\n");
+      printf( "   --load-slot=NUM     Loads savegame from slot NUM\n");
       printf( "   --disable-sound     Disables the sound emulation\n");
       printf( "   --disable-limiter   Disables the 60 fps limiter\n");
       printf( "   --3d-engine=ENGINE  Enables software 3d rasterizer, available ENGINES:\n");
@@ -174,7 +174,7 @@ fill_config( struct my_config *config,
       printf( "                         1 = internal desmume software rasterizer\n");
 #ifdef INCLUDE_OPENGL_2D
       printf( "   --opengl-2d         Enables using OpenGL for screen rendering\n");
-      printf( "    --soft-convert     Use software colour conversion during OpenGL\n");
+      printf( "   --soft-convert      Use software colour conversion during OpenGL\n");
       printf( "                       screen rendering. May produce better or worse\n");
       printf( "                       frame rates depending on hardware.\n");
 #endif
@@ -188,16 +188,16 @@ fill_config( struct my_config *config,
       printf( "                         5 = Spanish\n");
       printf( "\n");
 #ifdef GDB_STUB
-      printf( "   --arm9gdb=PORT_NUM      Enable the ARM9 GDB stub on the given port\n");
-      printf( "   --arm7gdb=PORT_NUM      Enable the ARM7 GDB stub on the given port\n");
+      printf( "   --arm9gdb=PORT_NUM  Enable the ARM9 GDB stub on the given port\n");
+      printf( "   --arm7gdb=PORT_NUM  Enable the ARM7 GDB stub on the given port\n");
 #endif
       //printf( "   --sticky                Enable sticky keys and stylus\n");
       printf( "\n");
       printf( "   --cflash=PATH_TO_DISK_IMAGE\n");
       printf( "                       Enable disk image GBAMP compact flash emulation\n");
       printf( "\n");
-      printf( "   --help                  Display this message\n");
-      printf( "   --version               Display the version\n");
+      printf( "   --help              Display this message\n");
+      printf( "   --version           Display the version\n");
       good_args = 0;
     }
     else if ( strcmp( argv[i], "--version") == 0) {