diff --git a/websocketpp/error.hpp b/websocketpp/error.hpp
index c7e49d901f..7710bba7ad 100644
--- a/websocketpp/error.hpp
+++ b/websocketpp/error.hpp
@@ -102,7 +102,13 @@ enum value {
     server_only,
     
     /// HTTP connection ended
-    http_connection_ended
+    http_connection_ended,
+    
+    /// WebSocket opening handshake timed out
+    open_handshake_timeout,
+    
+    /// WebSocket close handshake timed out
+    close_handshake_timeout
 }; // enum value
 
 
@@ -158,6 +164,10 @@ public:
                 return "Feature not available on client endpoints";
             case error::http_connection_ended:
                 return "HTTP connection ended";
+            case error::open_handshake_timeout:
+                return "The opening handshake timed out";
+            case error::close_handshake_timeout:
+                return "The closing handshake timed out";
             default:
                 return "Unknown";
         }