diff --git a/CHANGES.md b/CHANGES.md
index c764a592..91e34ae3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,10 @@
 
 * Use server `Keep-Alive` setting as slow request timeout.
 
+### Changed
+
+* Use 5 seconds keep-alive timer by default.
+
 
 ## [0.7.7] - 2018-09-11
 
diff --git a/src/server/http.rs b/src/server/http.rs
index 948889f4..b6f577b0 100644
--- a/src/server/http.rs
+++ b/src/server/http.rs
@@ -70,7 +70,7 @@ where
             factory: Arc::new(f),
             host: None,
             backlog: 2048,
-            keep_alive: KeepAlive::Os,
+            keep_alive: KeepAlive::Timeout(5),
             shutdown_timeout: 30,
             exit: false,
             no_http2: false,
@@ -131,7 +131,7 @@ where
 
     /// Set server keep-alive setting.
     ///
-    /// By default keep alive is set to a `Os`.
+    /// By default keep alive is set to a 5 seconds.
     pub fn keep_alive<T: Into<KeepAlive>>(mut self, val: T) -> Self {
         self.keep_alive = val.into();
         self