diff --git a/README b/README
index 4310aed5..65b2312e 100644
--- a/README
+++ b/README
@@ -381,7 +381,7 @@ dosbox -eraseconf
         You can specify this command more than once. In this case it will
         move to second program if the first one fails to start.
 
-  -opencaptures
+  -opencaptures program
         calls program with as first paramater the location of the captures 
         folder.
   
@@ -389,7 +389,7 @@ dosbox -eraseconf
         prints the location of the default configuration file.
 
   -eraseconf
-        removes the default configuration file
+        removes the default configuration file.
 
 Note: If a name/command/configfile/languagefile contains a space, put
       the whole name/command/configfile/languagefile between quotes
diff --git a/docs/dosbox.1 b/docs/dosbox.1
index c895bbbe..653e57d3 100644
--- a/docs/dosbox.1
+++ b/docs/dosbox.1
@@ -1,5 +1,5 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
-.TH DOSBOX 1 "Jul 01, 2007"
+.TH DOSBOX 1 "May 27, 2009"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
 dosbox \- an x86/DOS emulator with sound/graphics
@@ -18,7 +18,15 @@ dosbox \- an x86/DOS emulator with sound/graphics
 .B [\-exit]
 .BI "[\-machine " machinetype ]
 .LP
-.B dosbox -version
+.B dosbox \-version
+.LP
+.BI "dosbox \-editconf" " program"
+.LP
+.BI "dosbox \-opencaptures" " program"
+.LP
+.B dosbox \-printconf
+.LP
+.B dosbox \-eraseconf
 .SH DESCRIPTION
 This manual page briefly documents
 .BR "dosbox" ", an x86/DOS emulator."
@@ -74,17 +82,31 @@ wish to execute on startup. Multiple
 .RB "Start " dosbox " with the language specified in "
 .IR langfile .
 .TP
-.B \-exit
-.BR dosbox " will close itself when the DOS program specified by "file " ends."
+.B "\-exit "
+.BR "dosbox" " will close itself when the DOS program specified by "file " ends."
 .TP
 .BI \-machine " machinetype
 .RB "Setup " dosbox " to emulate a specific type of machine." 
-.RI "Valid choices are: " "hercules, cga, pcjr, tandy, vga(default)".
+.RI "Valid choices are: " "hercules, cga, tandy, pcjr, ega, vgaonly, svga_s3(default), svga_et3000, svga_et4000, svga_paradise, vesa_nolfb, vesa_oldvbe".
 The machinetype has influence on both the videocard and the available
 soundcards.
 .TP
 .B \-version
 Output version information and exit. Useful for frontends.
+.TP
+.BI \-editconf " program"
+.RI calls " program" " with as first parameter the configuration file."
+.R You can specify this command more than once. In this case it will
+.RI " move to second " program " if the first one fails to start."
+.TP
+.BI \-opencaptures " program"
+.RI "calls " program " with as  first paramater the location of the captures folder."
+.TP
+.B \-printconf
+.R prints the location of the default configuration file.
+.TP
+.B \-eraseconf
+.R removes the default configuration file.
 .SH "INTERNAL COMMANDS"
 .B dosbox
 supports most of the DOS commands found in command.com. In addition, the
@@ -243,11 +265,13 @@ Keyb can change the keyboardlayout and the codepage used inside dosbox.
 .RE
 .SH FILES
 Configuration and language files use a format similar to Windows .ini files. 
-First ~/.dosboxrc (if present)  will be loaded. If no
-configfile is specified at the commandline, a file named
+If no configfile is specified at the commandline, a file named
 .BR dosbox.conf " (if present in the current directory) will be"
-loaded automatically afterwards. If a configfile is specified at the commandline
-that one will be used instead.
+loaded automatically. If a configfile is specified at the commandline
+that one will be used instead. If no configfile is specified or found
+in the current directory
+.RB " then dosbox will load one from " ~/.dosbox/ ". It will try to create "
+one if there is none.
 .SH "SPECIAL KEYS"
 .TP 12m
 .IP ALT\-ENTER