diff --git a/tmux.1 b/tmux.1
index 6c71b242..9f3beabe 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.156 2009-08-20 11:53:27 tcunha Exp $
+.\" $Id: tmux.1,v 1.157 2009-08-24 16:35:24 tcunha Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -14,7 +14,7 @@
 .\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 .\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: August 19 2009 $
+.Dd $Mdocdate: August 23 2009 $
 .Dt TMUX 1
 .Os
 .Sh NAME
@@ -1343,7 +1343,7 @@ was given to the
 .Ic set-environment
 command).
 The default is
-.Ev DISPLAY .
+"DISPLAY WINDOWID SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION".
 .It Xo Ic visual-activity
 .Op Ic on | off
 .Xc
diff --git a/tmux.c b/tmux.c
index 33390b34..649501ef 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.163 2009-08-16 19:20:37 tcunha Exp $ */
+/* $Id: tmux.c,v 1.164 2009-08-24 16:35:24 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -390,7 +390,8 @@ main(int argc, char **argv)
 		options_set_number(&global_s_options, "status-utf8", 0);
 	options_set_string(&global_s_options,
 	    "terminal-overrides", "*88col*:colors=88,*256col*:colors=256");
-	options_set_string(&global_s_options, "update-environment", "DISPLAY");
+	options_set_string(&global_s_options, "update-environment", "DISPLAY "
+	    "WINDOWID SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID SSH_CONNECTION");
 	options_set_number(&global_s_options, "visual-activity", 0);
 	options_set_number(&global_s_options, "visual-bell", 0);
 	options_set_number(&global_s_options, "visual-content", 0);