diff --git a/package.json b/package.json
index b48883b2ad16..354c78b7d204 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
     "@spalger/filesaver": "1.1.2",
     "@spalger/leaflet-draw": "0.2.3",
     "@spalger/leaflet-heat": "0.1.3",
+    "@spalger/numeral": "^2.0.0",
     "@spalger/nvd3": "1.8.1",
     "@spalger/ui-ace": "0.2.3",
     "angular": "1.2.28",
@@ -105,7 +106,6 @@
     "mkdirp": "0.5.1",
     "moment": "2.10.6",
     "ng-clip": "0.2.6",
-    "numeral": "1.5.3",
     "raw-loader": "0.5.1",
     "request": "2.61.0",
     "requirefrom": "0.2.0",
diff --git a/src/server/logging/LogFormat.js b/src/server/logging/LogFormat.js
index 233e1f86f49c..db901d2ecc90 100644
--- a/src/server/logging/LogFormat.js
+++ b/src/server/logging/LogFormat.js
@@ -1,7 +1,7 @@
 let Stream = require('stream');
 let moment = require('moment');
 let _ = require('lodash');
-let numeral = require('numeral');
+let numeral = require('@spalger/numeral');
 let ansicolors = require('ansicolors');
 let stringify = require('json-stringify-safe');
 let querystring = require('querystring');
diff --git a/webpackShims/numeral.js b/webpackShims/numeral.js
new file mode 100644
index 000000000000..71326a840d72
--- /dev/null
+++ b/webpackShims/numeral.js
@@ -0,0 +1 @@
+module.exports = require('@spalger/numeral');