diff --git a/TODO b/TODO
index 0c38e857..1b0b74f1 100644
--- a/TODO
+++ b/TODO
@@ -101,4 +101,3 @@
 (hopefully) for 0.8, in no particular order:
 - document new layout stuff: section on layouts etc; document next-layout
 - document swap-pane and rotate-window
-- document set-remain-on-exit
diff --git a/tmux.1 b/tmux.1
index 58fb6363..be5067c7 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.87 2009-04-21 16:34:31 nicm Exp $
+.\" $Id: tmux.1,v 1.88 2009-04-21 16:38:23 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -904,6 +904,12 @@ Repeat is enabled for the default keys of the
 and
 .Ic resize-pane-down
 commands.
+.It Xo Ic set-remain-on-exit
+.Op Ic on | Ic off
+.Xc
+Set the
+.Ic remain-on-exit
+window option for any windows first created in this session.
 .It Xo Ic set-titles
 .Op Ic on | Ic off
 .Xc