diff --git a/CHANGES b/CHANGES
index 16810ee..e21a08a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,13 +12,19 @@
 
 - Combine netcat-alike and proxy support to allow "multihop" connections, with
   comma-separated host syntax.  Allows running
+
 	  dbclient user1@host1,user2@host2,user3@host3
+
   to end up at host3 via the other two, using SSH TCP forwarding. It's a bit
   like onion-routing. All connections are established from the local machine.
   The comma-separated syntax can also be used for scp/rsync, eg
+
 	  rsync -a -e dbclient m@gateway,m2@host,martello:/home/matt/ ~/backup/
+
   to bounce through a few hosts.
 
+- Add -I "idle timeout" option (contributed by Farrell Aultman)
+
 - Allow restrictions on authorized_keys logins such as restricting commands
   to be run etc. This is a subset of those allowed by OpenSSH, doesn't
   yet allow restricting source host.
diff --git a/dbclient.1 b/dbclient.1
index 590493d..4ab786e 100644
--- a/dbclient.1
+++ b/dbclient.1
@@ -93,10 +93,15 @@ useful for working around firewalls or routers that drop connections after
 a certain period of inactivity. The trade-off is that a session may be
 closed if there is a temporary lapse of network connectivity. A setting
 if 0 disables keepalives.
+.TP
+.B \-I \fIidle_timeout
+Disconnect the session if no traffic is transmitted or received for \fIidle_timeout\fR seconds.
+.TP
 .B \-J \fIproxy_command
 Use the standard input/output of the program \fIproxy_command\fR rather than using
 a normal TCP connection. A hostname should be still be provided, as this is used for
 comparing saved hostkeys.
+.TP
 .B \B \fIendhost:endport
 "Netcat-alike" mode, where Dropbear will connect to the given host, then create a
 forwarded connection to \fIendhost\fR. This will then be presented as dbclient's
diff --git a/dropbear.8 b/dropbear.8
index e3987bc..ecbad31 100644
--- a/dropbear.8
+++ b/dropbear.8
@@ -97,6 +97,9 @@ useful for working around firewalls or routers that drop connections after
 a certain period of inactivity. The trade-off is that a session may be
 closed if there is a temporary lapse of network connectivity. A setting
 if 0 disables keepalives.
+.TP
+.B \-I \fIidle_timeout
+Disconnect the session if no traffic is transmitted or received for \fIidle_timeout\fR seconds.
 .SH FILES
 
 .TP