diff --git a/debian/changelog b/debian/changelog
index 2e3d4de..a99a8dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 flexnbd (0.1.8) UNRELEASED; urgency=medium
 
-  * Set TCP keepalive on sockets so broken connections are reaped (#33, !33)
+  * Set TCP keepalive on sockets so broken connections are reaped (#33, !33,
+    !36)
   * Add a context to logs to make debugging problems easier (#34, !34)
 
  -- James Carter <james.carter@bytemark.co.uk>  Thu, 11 Jan 2018 10:05:35 +0000
diff --git a/src/server/client.c b/src/server/client.c
index 8b57b47..0614a6d 100644
--- a/src/server/client.c
+++ b/src/server/client.c
@@ -234,6 +234,10 @@ int client_read_request( struct client * client , struct nbd_request *out_reques
 				debug( "Connection reset while"
 						" reading request" );
 				return 0;
+			case ETIMEDOUT:
+				debug( "Connection timed out while"
+						" reading request" );
+				return 0;
 			default:
 				/* FIXME: I've seen this happen, but I
 				 * couldn't reproduce it so I'm leaving