diff --git a/CHANGES b/CHANGES
index 48fc4c7a..550e2d6d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+14 January 2009
+
+* Server locking on inactivity (lock-after-time) is now disabled by default.
+
 13 January 2009
 
 * kill-pane command.
@@ -902,7 +906,7 @@
   (including mutt, emacs). No status bar yet and no key remapping or other
   customisation.
 
-$Id: CHANGES,v 1.201 2009-01-13 06:50:10 nicm Exp $
+$Id: CHANGES,v 1.202 2009-01-14 18:41:55 nicm Exp $
 
  LocalWords:  showw utf UTF fulvio ciriaco joshe OSC APC gettime abc DEF OA clr
  LocalWords:  rivo nurges lscm Erdely eol smysession mysession ek dstname RB
diff --git a/tmux.1 b/tmux.1
index f77bf3a5..05539064 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.58 2009-01-12 21:23:58 tcunha Exp $
+.\" $Id: tmux.1,v 1.59 2009-01-14 18:41:55 nicm Exp $
 .\"
 .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
 .\"
@@ -689,7 +689,7 @@ resized and retain the limit at the point they were created.
 Lock the server after
 .Ar number
 seconds of inactivity.
-The default is 1800 seconds (30 minutes). 
+The default is off (set to 0). 
 .It Ic message-bg Ar colour
 Set status line message background colour, where
 .Ar colour
diff --git a/tmux.c b/tmux.c
index 23eb239e..c8254b86 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.94 2009-01-13 06:52:12 nicm Exp $ */
+/* $Id: tmux.c,v 1.95 2009-01-14 18:41:55 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -236,7 +236,7 @@ main(int argc, char **argv)
 	options_set_number(&global_options, "prefix", META);
 	options_set_number(&global_options, "prefix-time", 0);
 	options_set_number(&global_options, "set-titles", 1);
-	options_set_number(&global_options, "lock-after-time", 1800);
+	options_set_number(&global_options, "lock-after-time", 0);
 	options_set_number(&global_options, "status", 1);
 	options_set_number(&global_options, "status-bg", 2);
 	options_set_number(&global_options, "status-fg", 0);