diff --git a/config.js b/config.js
index ec05bba38..cc7daafac 100644
--- a/config.js
+++ b/config.js
@@ -23,7 +23,7 @@ require.config({
         "jquery":                   "node_modules/jquery/dist/jquery",
         "jquery-private":           "src/jquery-private",
         "jquery.browser":           "node_modules/jquery.browser/dist/jquery.browser",
-        "jquery.easing":            "node_modules/jquery-easing/jquery.easing.1.3.umd",          // XXX: Only required for https://conversejs.org website
+        "jquery.easing":            "node_modules/jquery-easing/jquery.easing.1.3.umd", // XXX: Only required for https://conversejs.org website
         "moment":                   "node_modules/moment/moment",
         "pluggable":                "node_modules/pluggable.js/pluggable",
         "polyfill":                 "src/polyfill",
@@ -41,10 +41,9 @@ require.config({
         "strophe.rsm":              "node_modules/strophejs-plugins/rsm/strophe.rsm",
         "strophe.vcard":            "node_modules/strophejs-plugins/vcard/strophe.vcard",
         "text":                     "node_modules/text/text",
-        "tpl":                      "node_modules/requirejs-undertemplate/tpl",
+        "tpl":                      "node_modules/lodash-template-loader/loader",
         "typeahead":                "components/typeahead.js/index",
         "lodash":                   "node_modules/lodash/lodash",
-        "underscore":               "node_modules/underscore/underscore",
         "utils":                    "src/utils",
 
         // Converse
@@ -188,14 +187,17 @@ require.config({
     map: {
         // '*' means all modules will get 'jquery-private'
         // for their 'jquery' dependency.
-        '*': { 'jquery': 'jquery-private' },
+        '*': {
+            'jquery': 'jquery-private',
+            "underscore": "lodash"
+         },
         // 'jquery-private' wants the real jQuery module
         // though. If this line was not here, there would
         // be an unresolvable cyclic dependency.
         'jquery-private': { 'jquery': 'jquery' }
     },
 
-    tpl: {
+    lodashLoader: {
         // Configuration for requirejs-tpl
         // Use Mustache style syntax for variable interpolation
         templateSettings: {
diff --git a/docs/CHANGES.md b/docs/CHANGES.md
index 638bef143..9503f4dcf 100755
--- a/docs/CHANGES.md
+++ b/docs/CHANGES.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 3.0.0 (Unreleased)
+- Use lodash instead of underscore.js [jcbrand]
+
 ## 2.0.5 (2017-02-01)
 - #743, #751, #753 Update to Strophe 1.2.12. SASL-EXTERNAL now has reduced priority, so it won't
   be prioritized above other auth mechanisms. [jcbrand]
diff --git a/package.json b/package.json
index 5487221f7..e1dc0c330 100644
--- a/package.json
+++ b/package.json
@@ -53,15 +53,15 @@
     "jquery.browser": ">=0.1.0",
     "jshint": "^2.9.4",
     "lodash": "^4.17.4",
+    "lodash-template-loader": "^2.0.0",
     "moment": "~2.13.0",
     "npm": "^4.1.1",
     "otr": "0.2.16",
     "phantom-jasmine": "0.1.8",
     "phantomjs": "~1.9.7-1",
-    "pluggable.js": "0.0.3",
+    "pluggable.js": "https://github.com/jcbrand/pluggable.js.git#d5679e907bfbc8e673f7fa23e75f21cb4a26ae57",
     "po2json": "^0.4.4",
     "requirejs": "2.3.2",
-    "requirejs-undertemplate": "~0.0.4",
     "snyk": "^1.21.2",
     "strophe.js": "1.2.12",
     "strophejs-plugins": "0.0.7",