diff --git a/src/Routers/FeaturesRouter.js b/src/Routers/FeaturesRouter.js
index 2205ceff..f0cdb3ea 100644
--- a/src/Routers/FeaturesRouter.js
+++ b/src/Routers/FeaturesRouter.js
@@ -1,11 +1,15 @@
+import { version }     from '../../package.json';
 import PromiseRouter   from '../PromiseRouter';
 import * as middleware from "../middlewares";
 import { getFeatures } from '../features';
 
 export class FeaturesRouter extends PromiseRouter {
   mountRoutes() {
-    this.route('GET','/features', middleware.promiseEnforceMasterKeyAccess, () => {
-      return { response: getFeatures() };
+    this.route('GET','/serverInfo', middleware.promiseEnforceMasterKeyAccess, () => {
+      return { response: {
+				features: getFeatures(),
+				parseServerVersion: version,
+			} };
     });
   }
 }
diff --git a/src/features.js b/src/features.js
index e7cd5102..6ff00095 100644
--- a/src/features.js
+++ b/src/features.js
@@ -58,7 +58,6 @@ let features = {
 
 // master switch for features
 let featuresSwitch = {
-  serverVersion: true,
   globalConfig: true,
   hooks: true,
   logs: true,