diff --git a/doc/configuration.txt b/doc/configuration.txt
index bcd5f80b..0fd58c4a 100644
--- a/doc/configuration.txt
+++ b/doc/configuration.txt
@@ -96,9 +96,10 @@ $HTTP["url"]
 $HTTP["remoteip"]
   match on the remote IP or a remote Network
 $SERVER["socket"]
-  match on socket.  Value must be on the format "$ip:$port" where $ip is an IP
-  address and $port a port number.  Only equal match (==) is supported.
-  It also binds to this socket.
+  match on socket. Value must be on the format "ip:port" where ip is an IP
+  address and port a port number. Only equal match (==) is supported.
+  It also binds the daemon to this socket. Use this if you want to do IP/port-
+  based virtual hosts.
 
 <operator> is one of:
 
@@ -221,6 +222,8 @@ dir-listing.activate
   enables virtual directory listings if a directory is requested no
   index-file was found 
 
+  Default: disabled
+
 dir-listing.hide-dotfiles
   if enabled, does not list hidden files in directory listings generated
   by the dir-listing option.
@@ -291,17 +294,20 @@ server.event-handler
 
 server.pid-file
   set the name of the .pid-file where the PID of the server should be placed. 
-  This option is used in combination with a start-script and the deamon mode
+  This option is used in combination with a start-script and the daemon mode
   
   Default: not set
   
 server.max-request-size
-  maximum size in kbytes of the request (header + body) 
+  maximum size in kbytes of the request (header + body). Only applies to POST
+  requests.
   
-  Default: 2Gb
+  Default: 2097152 (2GB)
 
 server.max-worker
-  number of worker processes to spawn (works but has no benefit)
+  number of worker processes to spawn. This is usually only needed on servers
+  which are fairly loaded and the network handler calls delay often (e.g. new
+  requests are not handled instantaneously).
   
   Default: 0
   
diff --git a/doc/performance.txt b/doc/performance.txt
index d52ea17b..3a5b9645 100644
--- a/doc/performance.txt
+++ b/doc/performance.txt
@@ -189,7 +189,9 @@ fall back to the ``writev() + mmap()`` network calls which is ok, but not as
 fast as possible but support files larger than 2GB.
 
 Disabling the TCP options reduces the overhead of each TCP packet and might
-help to get the last few percent of performance out of the server.
+help to get the last few percent of performance out of the server. Be aware that
+disabling these options most likely decreases performance for high-latency and lossy
+links.
 
 - net.ipv4.tcp_sack = 0
 - net.ipv4.tcp_timestamps = 0
@@ -205,8 +207,10 @@ If you have a lot of large file uploads, increasing the receive buffers will hel
 - net.ipv4.tcp_rmem = 4096 87380 524288
 - net.core.rmem_max = 1048576
 
-Keep in mind that the buffers have to be multiplied by server.max-fds and be
-allocated in the kernel area. Be careful with that.
+Keep in mind that every TCP connection uses the configured amount of memory for socket
+buffers. If you've got many connections this can quickly drain the available memory.
+
+See http://www.acc.umu.se/~maswan/linux-netperf.txt for more information on these parameters.
 
 FreeBSD
 -------