diff --git a/doc/rtorrent.1 b/doc/rtorrent.1
index 8378e2d4..601a92a4 100644
--- a/doc/rtorrent.1
+++ b/doc/rtorrent.1
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "RTORRENT" "1" "20 June 2007" "BitTorrent client for ncurses" ""
+.TH "RTORRENT" "1" "27 January 2008" "BitTorrent client for ncurses" ""
 
 .SH NAME
 rtorrent \- a BitTorrent client for ncurses
@@ -64,6 +64,11 @@ Stop an active download, or remove a stopped download.
 \fB^K\fR
 Close a torrent and its files.
 .TP
+\fB^E\fR
+Set the 'create/resize queued' flags on all files in a torrent. This
+is necessary if the underlying files in a torrent have been deleted or
+truncates, and thus rtorrent much recreate them.
+.TP
 \fB^R\fR
 Initiate hash check of torrent.
 .TP
@@ -191,9 +196,8 @@ Set the default download directory. Defaults to "./".
 \fBsession = \fIdirectory\fB\fR
 Session management will be enabled and the torrent files for all open
 downloads will be stored in this directory. Only one instance of
-rtorrent should be used with each session directory, though at the
-moment no locking is done. An empty string will disable the session
-directory.
+rtorrent can be used per session directory. An empty string will
+disable the session directory.
 .TP
 \fBhttp_proxy = \fIurl\fB\fR
 Use a http proxy. Use an empty string to disable.
@@ -219,6 +223,9 @@ with encryption turned on if it was off or off if it was on),
 \fBprefer_plaintext\fR (choose plaintext when peer offers a choice 
 between plaintext transmission and RC4 encryption, otherwise RC4 will be used).
 .TP
+\fBpeer_exchange = \fIyes | no\fB\fR
+Enable/disable peer exchange for torrents that aren't marked private. Disabled by default.
+.TP
 \fBschedule = \fIid\fB,\fIstart\fB,\fIinterval\fB,\fIcommand\fB\fR
 Call \fBcommand\fR every \fBinterval\fR
 seconds, starting from \fBstart\fR\&. An
@@ -247,7 +254,8 @@ have been deleted. Clear the association with the 'U' key.
 \fBclose_low_diskspace = \fIspace\fB\fR
 Close any active torrents on filesystems with less than
 \fBspace\fR diskspace left. Use with
-the \fBschedule\fR option.
+the \fBschedule\fR option. A default scheduled event
+with id \fBlow_diskspace\fR is set to 500Mb.
 .TP
 \fBload = \fIfile\fB\fR
 .TP
@@ -359,6 +367,26 @@ peers we want. A negative value disables this feature.
 Use UDP trackers. Disable if you are behind a firewall, etc, that does
 not allow connections to UDP trackers.
 .TP
+\fBdht = \fIdisabled|off|auto|on\fB\fR
+Support for querying the distributed hash table (DHT) to find peers for trackerless
+torrents or when all trackers are down. Set to \fBdisable\fR to completely
+disable DHT, \fBoff\fR (default) to enable DHT but to not start the
+DHT server, \fBauto\fR to automatically start and stop the DHT server
+as needed or \fBon\fR for permanently keeping the DHT server running.
+When set to automatic, the DHT server will start up when the first non-private torrent
+is started, and will stop 15-30 minutes after the last non-private torrent is
+stopped (or when rTorrent quits). For DHT to work, a session directory must be set (for
+saving the DHT cache).
+.TP
+\fBdht_port = \fInumber\fB\fR
+Set the UDP listen port for DHT. Defaults to 6881.
+.TP
+\fBdht_add_node = \fIhost[:port]\fB\fR
+Not intended for use in the configuration file but as one-time option in the
+client or on the command line to bootstrap an empty DHT node table. Contacts 
+the given node and attempts to bootstrap from it if it replies.
+The port is optional, with port 6881 being used by default.
+.TP
 \fBhttp_capath = \fIpath\fB\fR
 .TP
 \fBhttp_cacert = \fIfilename\fB\fR
@@ -483,11 +511,11 @@ allocated to file chunks.
 \fBreceive_buffer_size = \fIvalue\fB\fR
 Adjust the send and receive buffer size for socket.
 .TP
-\fBumask = \fI0644\fB\fR
+\fBumask = \fI0022\fB\fR
 Set the umask for this process, which is applied to all files created
 by the program.
 .TP
-\fBworking_directory = \fIdirectory\fB\fR
+\fBcwd = \fIdirectory\fB\fR
 Changes the working directory of the process using
 \fBchdir\fR\&.
 .TP
diff --git a/doc/rtorrent.1.xml b/doc/rtorrent.1.xml
index 5d05250a..f08fc7dd 100644
--- a/doc/rtorrent.1.xml
+++ b/doc/rtorrent.1.xml
@@ -1,5 +1,4 @@
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"
-  "http://oasis-open.org/docbook/xml/4.1/docbookx.dtd">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
 
 <refentry id="rtorrent">