diff --git a/desmume/src/cli/doc/desmume-cli.1 b/desmume/src/cli/doc/desmume-cli.1
index 29d2e406d..44a7f686b 100644
--- a/desmume/src/cli/doc/desmume-cli.1
+++ b/desmume/src/cli/doc/desmume-cli.1
@@ -44,12 +44,12 @@ Disables the sound emulation
 Disables the 60 fps limiter
 .TP
 .B \-\-3d-engine=ENGINE
-Enables software 3d rasterizer, available ENGINES:
+Select available 3d emulation:
 .RS
-0 = 3d disabled - default
+0 = 3d disabled
 .RE
 .RS
-1 = internal desmume software rasterizer
+1 = internal desmume software rasterizer (default)
 .RE
 .TP
 .B \-\-opengl-2d
@@ -64,6 +64,30 @@ Enable the ARM9 GDB stub on the given port
 .B \-\-arm7gdb=PORT_NUM
 Enable the ARM7 GDB stub on the given port
 .TP
+.B \-\-save-type=TYPE
+Select savetype from the following:
+.RS
+0 = Autodetect
+.RE
+.RS
+1 = EEPROM 4kbit
+.RE
+.RS
+2 = EEPROM 64kbit
+.RE
+.RS
+3 = EEPROM 512kbit
+.RE
+.RS
+4 = FRAM 256kbit
+.RE
+.RS
+5 = FLASH 2mbit
+.RE
+.RS
+6 = FLASH 4mbit
+.RE
+.TP
 .B \-\-fwlang=LANG
 Set the language in the firmware, LANG as follows:
 .RS
@@ -95,9 +119,43 @@ Show summary of options.
 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
+.SH INPUT
+Mouse cursor acts as stylus, mouse click replaces stylus touch.
+.PP
+Keyboard is configured as follows:
+.RS
+F1-F10 load savegame from slot 1-10
+.RE
+.RS
+Shift+F1-F10 save game to slot 1-10
+.RE
+.RS
+Non-keypad arrows act as d-pad
+.RE
+.RS
+z = A
+.RE
+.RS
+x = B
+.RE
+.RS
+a = Y
+.RE
+.RS
+s = X
+.RE
+.RS
+q = L
+.RE
+.RS
+w = R
+.RE
+.RS
+Enter = START
+.RE
+.RS
+Left Shift = SELECT
+.RE
 .SH AUTHOR
 desmume was written by DeSmuME team
 (http://sourceforge.net/projects/desmume).
diff --git a/desmume/src/gtk-glade/doc/desmume-glade.1 b/desmume/src/gtk-glade/doc/desmume-glade.1
index 429d9e6a4..b20f7b175 100644
--- a/desmume/src/gtk-glade/doc/desmume-glade.1
+++ b/desmume/src/gtk-glade/doc/desmume-glade.1
@@ -33,13 +33,24 @@ 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 \-\-load-slot=NUM
+Loads savegame from slot NUM
 .TP
 .B \-\-soft-convert
 Use software colour conversion during OpenGL screen rendering. May produce better or worse frame rates depending on hardware.
 .TP
-.B \-\-disable-3d
-Disables the 3D emulation
+.B \-\-3d-engine=ENGINE
+Select available 3d emulation:
+.RS
+0 = 3d disabled
+.RE
+.RS
+1 = internal desmume software rasterizer (default)
+.RE
+.RS
+2 = osmesa or gtkglext opengl (if available, depending on compilation options, see desmume --help)
+.RE
 .TP
 .B \-\-disable-limiter
 Disables the 60 fps limiter
@@ -55,9 +66,45 @@ Show summary of options.
 .TP
 .B \-v, \-\-version
 Show version of program.
-.SH SEE ALSO
-.BR undocumented (7)
-.br
+.SH INPUT
+Mouse cursor acts as stylus, mouse click replaces stylus touch.
+.PP
+Keyboard can be configured and by default works as follows:
+.RS
+F1-F10 load savegame from slot 1-10
+.RE
+.RS
+Shift+F1-F10 save game to slot 1-10
+.RE
+.RS
+Non-keypad arrows act as d-pad
+.RE
+.RS
+z = A
+.RE
+.RS
+x = B
+.RE
+.RS
+a = Y
+.RE
+.RS
+s = X
+.RE
+.RS
+q = L
+.RE
+.RS
+w = R
+.RE
+.RS
+Enter = START
+.RE
+.RS
+Left Shift = SELECT
+.RE
+.PP
+Desmume accepts joystick events, which can be configured by user.
 .SH AUTHOR
 desmume was written by DeSmuME team
 (http://sourceforge.net/projects/desmume).
diff --git a/desmume/src/gtk/doc/desmume.1 b/desmume/src/gtk/doc/desmume.1
index b3e653fee..5c26f0d36 100644
--- a/desmume/src/gtk/doc/desmume.1
+++ b/desmume/src/gtk/doc/desmume.1
@@ -33,7 +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 \-\-load-slot=NUM
+Loads savegame from slot NUM
 .TP
 .B \-\-opengl-2d
 Enables using OpenGL for screen rendering
@@ -41,8 +43,17 @@ Enables using OpenGL for screen rendering
 .B \-\-soft-convert
 Use software colour conversion during OpenGL screen rendering. May produce better or worse frame rates depending on hardware.
 .TP
-.B \-\-disable-3d
-Disables the 3D emulation
+.B \-\-3d-engine=ENGINE
+Select available 3d emulation:
+.RS
+0 = 3d disabled 
+.RE
+.RS
+1 = internal desmume software rasterizer (default)
+.RE
+.RS
+2 = osmesa or gtkglext opengl (if available, depending on compilation options, see desmume --help)
+.RE
 .TP
 .B \-\-disable-sound
 Disables the sound emulation
@@ -64,9 +75,45 @@ Show summary of options.
 .TP
 .B \-v, \-\-version
 Show version of program.
-.SH SEE ALSO
-.BR undocumented (7)
-.br
+.SH INPUT
+Mouse cursor acts as stylus, mouse click replaces stylus touch.
+.PP
+Keyboard can be configured and by default works as follows:
+.RS
+F1-F10 load savegame from slot 1-10
+.RE
+.RS
+Shift+F1-F10 save game to slot 1-10
+.RE
+.RS
+Non-keypad arrows act as d-pad
+.RE
+.RS
+z = A
+.RE
+.RS
+x = B
+.RE
+.RS
+a = Y
+.RE
+.RS
+s = X
+.RE
+.RS
+q = L
+.RE
+.RS
+w = R
+.RE
+.RS
+Enter = START
+.RE
+.RS
+Left Shift = SELECT
+.RE
+.PP
+Desmume accepts joystick events, which can be configured by user.
 .SH AUTHOR
 desmume was written by DeSmuME team
 (http://sourceforge.net/projects/desmume).