diff --git a/Gruntfile.js b/Gruntfile.js
index 76dc1da96..a91f9c02e 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -96,7 +96,7 @@ module.exports = function(grunt) {
         var done = this.async();
         var child_process = require('child_process');
         var exec = child_process.exec;
-        exec('./node_modules/.bin/bower update && cd ./components/strophe && make normal',
+        exec('./node_modules/.bin/bower update && cd ./components/strophe && make normal && cd ../otr && npm install && make build',
              function (err, stdout, stderr) {
                 if (err) {
                     grunt.log.write('build failed with error code '+err.code);
diff --git a/bower.json b/bower.json
index 632955ed2..d4eb0ca45 100644
--- a/bower.json
+++ b/bower.json
@@ -17,7 +17,7 @@
     "strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js",
     "strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js",
     "strophe.muc": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/muc/strophe.muc.js",
-    "otr": "~0.2.5",
+    "otr": "https://github.com/arlolra/otr.git#e6cc5c247569df1118de8dd86ee57c2d1b3ce91e",
     "crypto-js": "~3.1.2",
     "almond": "~0.2.6"
   },
diff --git a/converse.js b/converse.js
index 6e97a1d6e..ae338b34d 100644
--- a/converse.js
+++ b/converse.js
@@ -13,7 +13,7 @@
     }
     if (typeof define === 'function' && define.amd) {
         define("converse", [
-            "components/otr/build/otr",
+            "otr",
             "crypto.aes",
             "locales",
             "backbone.localStorage",
diff --git a/main.js b/main.js
index ce745f63b..d0c6a3223 100644
--- a/main.js
+++ b/main.js
@@ -11,6 +11,11 @@ require.config({
         "strophe.roster": "components/strophe.roster/index",
         "strophe.vcard": "components/strophe.vcard/index",
         "strophe.disco": "components/strophe.disco/index",
+        "otr": "components/otr/build/otr",
+        "bigint": "components/otr/build/dep/bigint",
+        "crypto": "components/otr/build/dep/crypto",
+        "eventemitter": "components/otr/build/dep/eventemitter",
+        "salsa20": "components/otr/build/dep/salsa20",
         "crypto.aes": "components/crypto-js/build/rollups/aes"
     },