diff --git a/TODO b/TODO
index e4fc4be0..c8d1f460 100644
--- a/TODO
+++ b/TODO
@@ -96,3 +96,5 @@
 - command-prompt should accept an argument to specify the prompt
 - fix rxvt cursor fg issue (text under cursor has non-white fg)
 - key handling sucks a bit and needs to be reworked
+- prefix-time should only apply to a few commands otherwise it is too annoying
+
diff --git a/tmux.c b/tmux.c
index d2493ef5..23eb239e 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.93 2009-01-12 23:37:02 nicm Exp $ */
+/* $Id: tmux.c,v 1.94 2009-01-13 06:52:12 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -234,7 +234,7 @@ main(int argc, char **argv)
 	options_set_number(&global_options, "message-bg", 3);
 	options_set_number(&global_options, "message-fg", 0);
 	options_set_number(&global_options, "prefix", META);
-	options_set_number(&global_options, "prefix-time", 300);
+	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, "status", 1);