diff --git a/doc/elinks.1.txt b/doc/elinks.1.txt
index 493eb79fd..231b879fc 100644
--- a/doc/elinks.1.txt
+++ b/doc/elinks.1.txt
@@ -57,12 +57,12 @@ ELINKS_CONFDIR::
 ELINKS_TWTERM, LINKS_TWTERM::
 
 	The command to run when selecting File -> New window and if
-	`TWDISPLAY` is defined (default `twterm -e`)
+	`TWDISPLAY` is defined (default `twterm -e`).
 
 ELINKS_XTERM, LINKS_XTERM::
 
 	The command to run when selecting File -> New window and if `DISPLAY`
-	is defined (default `xterm -e`)
+	is defined (default `xterm -e`).
 
 FTP_PROXY, HTTP_PROXY, HTTPS_PROXY::
 
@@ -83,6 +83,11 @@ WWW_HOME::
 FILES
 -----
 
+Configuration files controlled by ELinks are located in the user
+configuration directory, defaulting to '~/.elinks/'. In addition to the
+files listed below, a user defined CSS stylesheet can be defined using
+the 'document.css.stylesheet' option.
+
 @sysconfdir@/elinks.conf::
 	Site-wide configuration file.
 
@@ -116,15 +121,14 @@ FILES
 ~/.elinks/socket::
 	Internal 'ELinks' socket for communication between its instances.
 
-~/.mailcap::
+~/.mailcap, /etc/mailcap::
 	Mappings of MIME types to external handlers.
 
-~/.mime.types::
+~/.mime.types, /etc/mime.types::
 	Mappings of file extensions to MIME types.
 
-Other files that ELinks uses from '~/.elinks/' includes the user defined CSS
-stylesheet. The name of the file can set in the 'document.css.stylesheet'
-option.
+//////////////////////////////////////////////////////////////////////////////
+// Commented out since it's neither super useful nor manpage material. --jonas
 
 PLATFORMS
 ---------
@@ -132,6 +136,7 @@ PLATFORMS
 'ELinks' is known to work on 'Linux', 'FreeBSD', 'OpenBSD', 'Solaris', 'IRIX',
 'HPUX', 'Digital Unix', 'AIX', 'OS/2', 'BeOS' and 'RISC OS'. Port for 'Win32'
 is in state of beta testing.
+//////////////////////////////////////////////////////////////////////////////
 
 BUGS
 ----
diff --git a/doc/man/man1/elinks.1.in b/doc/man/man1/elinks.1.in
index 0b7a0366f..20678dd7e 100644
--- a/doc/man/man1/elinks.1.in
+++ b/doc/man/man1/elinks.1.in
@@ -1,11 +1,11 @@
 .\"     Title: elinks
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
-.\"      Date: 01/22/2008
+.\"      Date: 03/02/2008
 .\"    Manual: 
 .\"    Source: 
 .\"
-.TH "ELINKS" "1" "01/22/2008" "" ""
+.TH "ELINKS" "1" "03/02/2008" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -268,7 +268,7 @@ Print
 \fIELinks\fR
 version information and exit.
 .RE
-Generated using output from ELinks version 0.11.3.GIT.
+Generated using output from ELinks version 0.11.4rc0.GIT.
 .sp
 .SH "ENVIRONMENT VARIABLES"
 .PP
@@ -293,7 +293,7 @@ ELINKS_TWTERM, LINKS_TWTERM
 The command to run when selecting File \-> New window and if
 TWDISPLAY
 is defined (default
-twterm \-e)
+twterm \-e).
 .RE
 .PP
 ELINKS_XTERM, LINKS_XTERM
@@ -301,7 +301,7 @@ ELINKS_XTERM, LINKS_XTERM
 The command to run when selecting File \-> New window and if
 DISPLAY
 is defined (default
-xterm \-e)
+xterm \-e).
 .RE
 .PP
 FTP_PROXY, HTTP_PROXY, HTTPS_PROXY
@@ -326,6 +326,8 @@ Homepage location (as in
 \fBlynx\fR(1)).
 .RE
 .SH "FILES"
+Configuration files controlled by ELinks are located in the user configuration directory, defaulting to \fI~/.elinks/\fR. In addition to the files listed below, a user defined CSS stylesheet can be defined using the \fIdocument.css.stylesheet\fR option.
+.sp
 .PP
 @sysconfdir@/elinks.conf
 .RS 4
@@ -384,20 +386,15 @@ Internal
 socket for communication between its instances.
 .RE
 .PP
-~/.mailcap
+~/.mailcap, /etc/mailcap
 .RS 4
 Mappings of MIME types to external handlers.
 .RE
 .PP
-~/.mime.types
+~/.mime.types, /etc/mime.types
 .RS 4
 Mappings of file extensions to MIME types.
 .RE
-Other files that ELinks uses from \fI~/.elinks/\fR includes the user defined CSS stylesheet. The name of the file can set in the \fIdocument.css.stylesheet\fR option.
-.sp
-.SH "PLATFORMS"
-\fIELinks\fR is known to work on \fILinux\fR, \fIFreeBSD\fR, \fIOpenBSD\fR, \fISolaris\fR, \fIIRIX\fR, \fIHPUX\fR, \fIDigital Unix\fR, \fIAIX\fR, \fIOS/2\fR, \fIBeOS\fR and \fIRISC OS\fR. Port for \fIWin32\fR is in state of beta testing.
-.sp
 .SH "BUGS"
 Please report any other bugs you find to the either the ELinks mailing list at <elinks\-users@linuxfromscratch.org> or if you prefer enter them into the bug tracking system <http://bugzilla.elinks.cz/>. More information about how to get in contact with developers and getting help can be found on the community page <http://elinks.cz/community.html>.
 .sp