diff --git a/frontend/app/global.js b/frontend/app/global.js
index 92b3e29517..8cfd7b5826 100644
--- a/frontend/app/global.js
+++ b/frontend/app/global.js
@@ -47,9 +47,9 @@ require('jquery-ui/themes/base/jquery.ui.datepicker.css');
 // TODO: move require to backlogs plugin
 require('jquery-ui/themes/base/jquery.ui.dialog.css');
 
-require('momentjs');
-require('momentjs/lang/en-gb.js');
-require('momentjs/lang/de.js');
+require('moment');
+require('moment/locale/en-gb.js');
+require('moment/locale/de.js');
 
 require('moment-timezone/moment-timezone.js');
 require('moment-timezone/moment-timezone-data.js');
diff --git a/frontend/bower.json b/frontend/bower.json
index 3e8192ce9a..de634c3f3d 100644
--- a/frontend/bower.json
+++ b/frontend/bower.json
@@ -18,8 +18,8 @@
     "angular-truncate": "sparkalow/angular-truncate#fdf60fda265042d12e9414b5354b2cc52f1419de",
     "angular-feature-flags": "mjt01/angular-feature-flags",
     "jquery-migrate": "~1.2.1",
-    "momentjs": "~2.7.0",
-    "moment-timezone": "~0.2.0",
+    "moment": "finnlabs/moment#9bc879e7b146c484b499b3135b8d84e8425f8ec4",
+    "moment-timezone": "~0.3.1",
     "angular-context-menu": "nickmessing/angular-context-menu#a908eccaec323cd66973d58af4965694bdff16a1",
     "angular-busy": "~4.1.1",
     "hyperagent": "manwithtwowatches/hyperagent#v0.4.2",
@@ -39,6 +39,7 @@
     "select2": "3.3.2",
     "jquery": "1.11.0",
     "angular": "1.3.14",
-    "angular-animate": "1.3.14"
+    "angular-animate": "1.3.14",
+    "moment": "9bc879e7b146c484b499b3135b8d84e8425f8ec4"
   }
 }