diff --git a/Program/Mighty/Report.hs b/Program/Mighty/Report.hs
--- a/Program/Mighty/Report.hs
+++ b/Program/Mighty/Report.hs
@@ -20,6 +20,7 @@
 import GHC.IO.Exception (IOErrorType(..))
 import Network.Wai
 import Network.Wai.Handler.Warp (InvalidRequest)
+import Network.Wai.Handler.Warp.Timeout (TimeoutThread(..))
 import System.IO
 import System.IO.Error (ioeGetErrorType)
 import System.Posix (getProcessID)
@@ -58,10 +59,12 @@
 warpHandler :: Reporter -> Maybe Request -> SomeException -> IO ()
 warpHandler rpt _ e = throwIO e `catches` handlers
   where
-    handlers = [Handler ah, Handler ih, Handler oh, Handler sh]
+    handlers = [Handler ah, Handler th, Handler ih, Handler oh, Handler sh]
     ah :: AsyncException -> IO ()
     ah ThreadKilled = norecode
     ah x            = recode x
+    th :: TimeoutThread -> IO ()
+    th TimeoutThread = norecode
     ih :: InvalidRequest -> IO ()
     ih _ = norecode
     oh :: IOException -> IO ()
diff --git a/conf/example.conf b/conf/example.conf
--- a/conf/example.conf
+++ b/conf/example.conf
@@ -15,7 +15,7 @@
 Status_File_Dir: /usr/local/share/mighty/status
 Connection_Timeout: 30 # seconds
 Fd_Cache_Duration: 10 # seconds
-# Server_Name: Mighttpd/2.x.y
+# Server_Name: Mighttpd/3.x.y
 Tls_Port: 443
 Tls_Cert_File: certificate.pem # should change this with an absolute path
 # Currently, Tls_Key_file must not be encrypted.
diff --git a/mighttpd2.cabal b/mighttpd2.cabal
--- a/mighttpd2.cabal
+++ b/mighttpd2.cabal
@@ -1,5 +1,5 @@
 Name:                   mighttpd2
-Version:                3.1.0
+Version:                3.1.1
 Author:                 Kazu Yamamoto <kazu@iij.ad.jp>
 Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp>
 License:                BSD3