diff --git a/common/rdr/FdOutStream.cxx b/common/rdr/FdOutStream.cxx
index a6b85e2..533faa3 100644
--- a/common/rdr/FdOutStream.cxx
+++ b/common/rdr/FdOutStream.cxx
@@ -1,4 +1,5 @@
 /* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * Copyright 2011 Pierre Ossman for Cendio AB
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,6 +45,7 @@
 
 #include <rdr/FdOutStream.h>
 #include <rdr/Exception.h>
+#include <rfb/util.h>
 
 
 using namespace rdr;
@@ -56,6 +58,8 @@
 {
   ptr = start = sentUpTo = new U8[bufSize];
   end = start + bufSize;
+
+  gettimeofday(&lastWrite, NULL);
 }
 
 FdOutStream::~FdOutStream()
@@ -86,6 +90,11 @@
   return ptr - sentUpTo;
 }
 
+unsigned FdOutStream::getIdleTime()
+{
+  return rfb::msSince(&lastWrite);
+}
+
 void FdOutStream::flush()
 {
   int timeoutms_;
@@ -218,5 +227,7 @@
 
   if (n < 0) throw SystemException("write",errno);
 
+  gettimeofday(&lastWrite, NULL);
+
   return n;
 }
diff --git a/common/rdr/FdOutStream.h b/common/rdr/FdOutStream.h
index daa88b2..b7f6cb0 100644
--- a/common/rdr/FdOutStream.h
+++ b/common/rdr/FdOutStream.h
@@ -1,4 +1,5 @@
 /* Copyright (C) 2002-2005 RealVNC Ltd.  All Rights Reserved.
+ * Copyright 2011 Pierre Ossman for Cendio AB
  * 
  * This is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,6 +24,8 @@
 #ifndef __RDR_FDOUTSTREAM_H__
 #define __RDR_FDOUTSTREAM_H__
 
+#include <sys/time.h>
+
 #include <rdr/OutStream.h>
 
 namespace rdr {
@@ -43,6 +46,8 @@
 
     int bufferUsage();
 
+    unsigned getIdleTime();
+
   private:
     int overrun(int itemSize, int nItems);
     int writeWithTimeout(const void* data, int length, int timeoutms);
@@ -53,6 +58,7 @@
     int offset;
     U8* start;
     U8* sentUpTo;
+    struct timeval lastWrite;
   };
 
 }