diff --git a/CHANGES.md b/CHANGES.md
index 86e169872..52d3b5340 100755
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## 3.1.0 ((2017-07-05))
+## 3.2.0 (Unreleased)
+
+- #866 Add babel in order to support ES2015 syntax
+
+## 3.1.0 (2017-07-05)
 
 ### API changes
 - Deprecate the `updateSettings` method in favour of
diff --git a/Makefile b/Makefile
index ea13a8b71..25e91c938 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,11 @@ watch: stamp-bundler
 
 .PHONY: watchjs
 watchjs: stamp-npm
-	$(BABEL) --source-maps --watch=./src --out-dir=./build
+	$(BABEL) --source-maps --watch=./src --out-dir=./builds
+
+.PHONY: transpile
+transpile: stamp-npm
+	$(BABEL) --source-maps --out-dir=./builds ./src
 
 BUILDS = dist/converse.js \
 		 dist/converse.min.js \
@@ -169,6 +173,14 @@ dist/converse.min.js: src locale node_modules *.js
 	$(RJS) -o src/build.js include=converse out=dist/converse.min.js
 dist/converse.js: src locale node_modules *.js
 	$(RJS) -o src/build.js include=converse out=dist/converse.js optimize=none 
+dist/converse-esnext.min.js: src locale node_modules *.js transpile
+	$(RJS) -o src/build-esnext.js include=converse out=dist/converse-esnext.min.js
+dist/converse-esnext.js: src locale node_modules *.js transpile
+	$(RJS) -o src/build-esnext.js include=converse out=dist/converse-esnext.js optimize=none 
+dist/inverse-esnext.js: src locale node_modules *.js
+	$(RJS) -o src/build-inverse-esnext.js include=inverse out=dist/inverse-esnext.js optimize=none 
+dist/inverse-esnext.min.js: src locale node_modules *.js
+	$(RJS) -o src/build-inverse-esnext.js include=inverse out=dist/inverse-esnext.min.js
 dist/inverse.js: src locale node_modules *.js
 	$(RJS) -o src/build-inverse.js include=inverse out=dist/inverse.js optimize=none 
 dist/inverse.min.js: src locale node_modules *.js
diff --git a/package.json b/package.json
index 82960a821..a0473783a 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,6 @@
     "pluggable.js": "https://github.com/jcbrand/pluggable.js.git#8f8c8235816f44cda0f855d6ca879445aaa486a1",
     "po2json": "^0.4.4",
     "requirejs": "2.3.3",
-    "requirejs-babel": "0.0.9",
     "run-headless-chromium": "^0.1.1",
     "sinon": "^2.1.0",
     "snyk": "^1.21.2",
diff --git a/src/build-inverse.js b/src/build-inverse.js
index 94db45ee0..5a56f831c 100644
--- a/src/build-inverse.js
+++ b/src/build-inverse.js
@@ -2,6 +2,28 @@
     baseUrl: "../",
     name: "almond",
     mainConfigFile: 'config.js',
+    paths: {
+        "converse-bookmarks":       "builds/converse-bookmarks",
+        "converse-chatview":        "builds/converse-chatview",
+        "converse-controlbox":      "builds/converse-controlbox",
+        "converse-core":            "builds/converse-core",
+        "converse-dragresize":      "builds/converse-dragresize",
+        "converse-headline":        "builds/converse-headline",
+        "converse-inverse":         "builds/converse-inverse",
+        "converse-mam":             "builds/converse-mam",
+        "converse-minimize":        "builds/converse-minimize",
+        "converse-muc":             "builds/converse-muc",
+        "converse-muc-embedded":    "builds/converse-muc-embedded",
+        "converse-notification":    "builds/converse-notification",
+        "converse-otr":             "builds/converse-otr",
+        "converse-ping":            "builds/converse-ping",
+        "converse-register":        "builds/converse-register",
+        "converse-roomslist":       "builds/converse-roomslist",
+        "converse-rosterview":      "builds/converse-rosterview",
+        "converse-singleton":       "builds/converse-singleton",
+        "converse-vcard":           "builds/converse-vcard",
+        "utils":                    "builds/utils"
+    },
     wrap: {
         startFile: "start.frag",
         endFile: "inverse-end.frag"
diff --git a/src/build-no-dependencies.js b/src/build-no-dependencies.js
index 78f2f6129..41184a2f0 100644
--- a/src/build-no-dependencies.js
+++ b/src/build-no-dependencies.js
@@ -38,6 +38,28 @@
         "otr",
         "lodash"
     ],
+    paths: {
+        "converse-bookmarks":       "builds/converse-bookmarks",
+        "converse-chatview":        "builds/converse-chatview",
+        "converse-controlbox":      "builds/converse-controlbox",
+        "converse-core":            "builds/converse-core",
+        "converse-dragresize":      "builds/converse-dragresize",
+        "converse-headline":        "builds/converse-headline",
+        "converse-inverse":         "builds/converse-inverse",
+        "converse-mam":             "builds/converse-mam",
+        "converse-minimize":        "builds/converse-minimize",
+        "converse-muc":             "builds/converse-muc",
+        "converse-muc-embedded":    "builds/converse-muc-embedded",
+        "converse-notification":    "builds/converse-notification",
+        "converse-otr":             "builds/converse-otr",
+        "converse-ping":            "builds/converse-ping",
+        "converse-register":        "builds/converse-register",
+        "converse-roomslist":       "builds/converse-roomslist",
+        "converse-rosterview":      "builds/converse-rosterview",
+        "converse-singleton":       "builds/converse-singleton",
+        "converse-vcard":           "builds/converse-vcard",
+        "utils":                    "builds/utils"
+    },
     wrap: {
         startFile: "start.frag",
         endFile: "end-no-dependencies.frag"
diff --git a/src/build.js b/src/build.js
index 1ddaf8d69..1c1625eca 100644
--- a/src/build.js
+++ b/src/build.js
@@ -2,6 +2,28 @@
     baseUrl: "../",
     name: "almond",
     mainConfigFile: 'config.js',
+    paths: {
+        "converse-bookmarks":       "builds/converse-bookmarks",
+        "converse-chatview":        "builds/converse-chatview",
+        "converse-controlbox":      "builds/converse-controlbox",
+        "converse-core":            "builds/converse-core",
+        "converse-dragresize":      "builds/converse-dragresize",
+        "converse-headline":        "builds/converse-headline",
+        "converse-inverse":         "builds/converse-inverse",
+        "converse-mam":             "builds/converse-mam",
+        "converse-minimize":        "builds/converse-minimize",
+        "converse-muc":             "builds/converse-muc",
+        "converse-muc-embedded":    "builds/converse-muc-embedded",
+        "converse-notification":    "builds/converse-notification",
+        "converse-otr":             "builds/converse-otr",
+        "converse-ping":            "builds/converse-ping",
+        "converse-register":        "builds/converse-register",
+        "converse-roomslist":       "builds/converse-roomslist",
+        "converse-rosterview":      "builds/converse-rosterview",
+        "converse-singleton":       "builds/converse-singleton",
+        "converse-vcard":           "builds/converse-vcard",
+        "utils":                    "builds/utils"
+    },
     wrap: {
         startFile: "start.frag",
         endFile: "end.frag"
diff --git a/src/config.js b/src/config.js
index 7e4054fee..5eae88c14 100644
--- a/src/config.js
+++ b/src/config.js
@@ -22,7 +22,6 @@ require.config({
         "backbone.noconflict":      "src/backbone.noconflict",
         "backbone.browserStorage":  "node_modules/backbone.browserStorage/backbone.browserStorage",
         "backbone.overview":        "node_modules/backbone.overview/backbone.overview",
-        "es6":                      "node_modules/requirejs-babel/es6",
         "eventemitter":             "node_modules/otr/build/dep/eventemitter",
         "es6-promise":              "node_modules/es6-promise/dist/es6-promise",
         "jquery":                   "node_modules/jquery/dist/jquery",