diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock
index eaaa4177505..ae6d9c1789f 100644
--- a/Gemfile_rails4.lock
+++ b/Gemfile_rails4.lock
@@ -55,9 +55,9 @@ GIT
 
 GIT
   remote: https://github.com/SamSaffron/message_bus
-  revision: 00f12ec544d7d72965f58d6af167cafa46aac582
+  revision: 6cdab8a4e0d06203cbdb146b52159e710b891a82
   specs:
-    message_bus (0.0.2)
+    message_bus (0.9.2)
       eventmachine
       rack (>= 1.1.3)
       redis
diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index eabbd1ea23a..136c074954e 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -18,6 +18,8 @@ else
   require_asset ("production/jquery-2.0.3.min.js")
 end
 
+require_asset("message-bus")
+
 require_asset ("jquery.ui.widget.js")
 require_asset ("handlebars.js")
 
diff --git a/app/assets/javascripts/discourse/lib/message_bus.js b/app/assets/javascripts/discourse/lib/message_bus.js
index fe0279f912a..ed18f383eb8 100644
--- a/app/assets/javascripts/discourse/lib/message_bus.js
+++ b/app/assets/javascripts/discourse/lib/message_bus.js
@@ -1,165 +1 @@
-/*jshint bitwise: false*/
-
-/**
-  Message Bus functionality.
-
-  @class MessageBus
-  @namespace Discourse
-  @module Discourse
-**/
-Discourse.MessageBus = (function() {
-  // http://stackoverflow.com/questions/105034/how-to-create-a-guid-uuid-in-javascript
-  var callbacks, clientId, failCount, interval, shouldLongPoll, queue, responseCallbacks, uniqueId, baseUrl;
-  var me;
-
-  uniqueId = function() {
-    return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      var r, v;
-      r = Math.random() * 16 | 0;
-      v = c === 'x' ? r : (r & 0x3 | 0x8);
-      return v.toString(16);
-    });
-  };
-
-  clientId = uniqueId();
-  responseCallbacks = {};
-  callbacks = [];
-  queue = [];
-  interval = null;
-  failCount = 0;
-  baseUrl = "/";
-
-  var isHidden = function() {
-    if (document.hidden !== void 0) {
-      return document.hidden;
-    } else if (document.webkitHidden !== void 0) {
-      return document.webkitHidden;
-    } else if (document.msHidden !== void 0) {
-      return document.msHidden;
-    } else if (document.mozHidden !== void 0) {
-      return document.mozHidden;
-    } else {
-      // problamatic fallback
-      return !document.hasFocus;
-    }
-  };
-
-  shouldLongPoll = function() {
-    return me.alwaysLongPoll || !isHidden();
-  };
-
-  me = {
-    enableLongPolling: true,
-    callbackInterval: 60000,
-    maxPollInterval: 3 * 60 * 1000,
-    callbacks: callbacks,
-    clientId: clientId,
-    alwaysLongPoll: false,
-    stop: false,
-    baseUrl: baseUrl,
-
-    // Start polling
-    start: function(opts) {
-      var poll,
-        _this = this;
-      if (!opts) opts = {};
-
-      poll = function() {
-        var data, gotData;
-        if (callbacks.length === 0) {
-          setTimeout(poll, 500);
-          return;
-        }
-        data = {};
-        _.each(callbacks, function(callback) {
-          data[callback.channel] = callback.last_id;
-        });
-        gotData = false;
-        _this.longPoll = $.ajax(baseUrl + "message-bus/" + clientId + "/poll?" + (!shouldLongPoll() || !_this.enableLongPolling ? "dlp=t" : ""), {
-          data: data,
-          cache: false,
-          dataType: 'json',
-          type: 'POST',
-          headers: {
-            'X-SILENCE-LOGGER': 'true'
-          },
-          success: function(messages) {
-            failCount = 0;
-            _.each(messages,function(message) {
-              gotData = true;
-              _.each(callbacks, function(callback) {
-                if (callback.channel === message.channel) {
-                  callback.last_id = message.message_id;
-                  callback.func(message.data);
-                }
-                if (message.channel === "/__status") {
-                  if (message.data[callback.channel] !== undefined) {
-                    callback.last_id = message.data[callback.channel];
-                  }
-                }
-              });
-            });
-          },
-          error: failCount += 1,
-          complete: function() {
-            if (gotData) {
-              setTimeout(poll, 100);
-            } else {
-              interval = _this.callbackInterval;
-              if (failCount > 2) {
-                interval = interval * failCount;
-              } else if (!shouldLongPoll()) {
-                // slowning down stuff a lot when hidden
-                // we will need to add a lot of fine tuning here
-                interval = interval * 4;
-              }
-              if (interval > _this.maxPollInterval) {
-                interval = _this.maxPollInterval;
-              }
-              setTimeout(poll, interval);
-            }
-            _this.longPoll = null;
-          }
-        });
-      };
-      poll();
-    },
-
-    // Subscribe to a channel
-    subscribe: function(channel, func, lastId) {
-      if (typeof(lastId) !== "number" || lastId < -1){
-        lastId = -1;
-      }
-      callbacks.push({
-        channel: channel,
-        func: func,
-        last_id: lastId
-      });
-      if (this.longPoll) {
-        return this.longPoll.abort();
-      }
-    },
-
-    // Unsubscribe from a channel
-    unsubscribe: function(channel) {
-      // TODO proper globbing
-      var glob;
-      if (channel.indexOf("*", channel.length - 1) !== -1) {
-        channel = channel.substr(0, channel.length - 1);
-        glob = true;
-      }
-      callbacks = $.grep(callbacks,function(callback) {
-        if (glob) {
-          return callback.channel.substr(0, channel.length) !== channel;
-        } else {
-          return callback.channel !== channel;
-        }
-      });
-      if (this.longPoll) {
-        return this.longPoll.abort();
-      }
-    }
-  };
-
-  return me;
-})();
+Discourse.MessageBus = window.MessageBus;