diff --git a/README.md b/README.md
index eeb73ffc..a13f17f0 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ A file sharing experiment which allows you to send encrypted files to other user
 
 ## Requirements
 
-- [Node.js 8.2+](https://nodejs.org/)
+- [Node.js 10.0+](https://nodejs.org/)
 - [Redis server](https://redis.io/) (optional for development)
 - [AWS S3](https://aws.amazon.com/s3/) or compatible service. (optional)
 
diff --git a/build/fluent_loader.js b/build/fluent_loader.js
index 53abc6d9..a9027d15 100644
--- a/build/fluent_loader.js
+++ b/build/fluent_loader.js
@@ -1,7 +1,4 @@
-// TODO: when node supports 'for await' we can remove babel-polyfill
-// and use 'fluent' instead of 'fluent/compat' (also below near line 42)
-require('babel-polyfill');
-const { MessageContext } = require('fluent/compat');
+const { MessageContext } = require('fluent');
 const fs = require('fs');
 
 function toJSON(map) {
@@ -39,8 +36,7 @@ module.exports = function(source) {
   return `
 module.exports = \`
 if (typeof window === 'undefined') {
-  require('babel-polyfill');
-  var fluent = require('fluent/compat');
+  var fluent = require('fluent');
 }
 (function () {
   var ctx = new fluent.MessageContext('${locale}', {useIsolating: false});