diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49160c30c..e217fd40a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,28 @@ All notable changes to this project will be documented in this file. See [standa
 * replaced lunr by lunr-mutable ([#915](https://github.com/verdaccio/verdaccio/issues/915)) ([1602840](https://github.com/verdaccio/verdaccio/commit/1602840))
 * verdaccio update notification on CLI ([#988](https://github.com/verdaccio/verdaccio/issues/988)) ([#998](https://github.com/verdaccio/verdaccio/issues/998)) ([bc04703](https://github.com/verdaccio/verdaccio/commit/bc04703))
 
+
+
+<a name="3.11.3"></a>
+## [3.11.3](https://github.com/verdaccio/verdaccio/compare/v3.11.2...v3.11.3) (2019-02-07)
+
+
+### Bug Fixes
+
+* server keepAliveTimeout is in milliseconds, config value in seconds. ([7f79c77](https://github.com/verdaccio/verdaccio/commit/7f79c77))
+
+
+
+<a name="3.11.2"></a>
+## [3.11.2](https://github.com/verdaccio/verdaccio/compare/v3.11.1...v3.11.2) (2019-02-05)
+
+
+### Bug Fixes
+
+* lodash vulnerability ([c35486d](https://github.com/verdaccio/verdaccio/commit/c35486d))
+
+
+
 <a name="3.11.1"></a>
 ## [3.11.1](https://github.com/verdaccio/verdaccio/compare/v3.11.0...v3.11.1) (2019-01-31)
 
diff --git a/package.json b/package.json
index b1e918519..981d01844 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "verdaccio": "./bin/verdaccio"
   },
   "dependencies": {
-    "@verdaccio/file-locking": "0.0.7",
+    "@verdaccio/file-locking": "0.0.8",
     "@verdaccio/local-storage": "2.0.0-beta.1",
     "@verdaccio/streams": "2.0.0-beta.0",
     "JSONStream": "1.3.5",
diff --git a/src/lib/bootstrap.js b/src/lib/bootstrap.js
index 24d23bc26..bd0b5ed7c 100644
--- a/src/lib/bootstrap.js
+++ b/src/lib/bootstrap.js
@@ -50,7 +50,7 @@ function startVerdaccio(config: any, cliListen: string, configPath: string, pkgV
       }
       if (config.server && config.server.keepAliveTimeout) {
         // $FlowFixMe library definition for node is not up to date (doesn't contain recent 8.0 changes)
-        webServer.keepAliveTimeout = config.server.keepAliveTimeout;
+        webServer.keepAliveTimeout = config.server.keepAliveTimeout * 1000;
       }
       unlinkAddressPath(addr);
 
diff --git a/yarn.lock b/yarn.lock
index d18c181dd..b6fd9b20e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1230,6 +1230,14 @@
     lockfile "1.0.3"
     lodash "4.17.10"
 
+"@verdaccio/file-locking@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.verdaccio.org/@verdaccio%2ffile-locking/-/file-locking-0.0.8.tgz#6acb62e17db2fa093f86158e4a1c0b2802a69359"
+  integrity sha512-kK7siED1Yc/t8+G3Iyb0vdQ6mM+TKNW2wM8LO0D6bXg3rBWlf863JG7JIedSGUeMzwFOKjX75jreiE+xVeAb3w==
+  dependencies:
+    lockfile "1.0.4"
+    lodash "4.17.11"
+
 "@verdaccio/local-storage@2.0.0-beta.1":
   version "2.0.0-beta.1"
   resolved "https://registry.verdaccio.org/@verdaccio%2flocal-storage/-/local-storage-2.0.0-beta.1.tgz#1aa602b24fa2f6b02d682e5e56b4894112e198e6"