diff --git a/lib/io/ioserver.js b/lib/io/ioserver.js
index ad852539..93f0fab7 100644
--- a/lib/io/ioserver.js
+++ b/lib/io/ioserver.js
@@ -126,10 +126,10 @@ function addTypecheckedFunctions(sock) {
  * Called after a connection is accepted
  */
 function handleConnection(sock) {
-    var ip = sock.request.connection.remoteAddress;
+    var ip = sock.client.conn.remoteAddress;
     if (!ip) {
         sock.emit("kick", {
-            reason: "Your IP address could not be determined from the socket connection.  See https://github.com/Automattic/socket.io/issues/1387#issuecomment-48425088 for details"
+            reason: "Your IP address could not be determined from the socket connection.  See https://github.com/Automattic/socket.io/issues/1737 for details"
         });
         return;
     }
diff --git a/lib/server.js b/lib/server.js
index 86a44dcb..4fcfd29e 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -45,6 +45,7 @@ var User = require("./user");
 var $util = require("./utilities");
 var db = require("./database");
 var Flags = require("./flags");
+var sio = require("socket.io");
 
 var Server = function () {
     var self = this;
@@ -55,7 +56,6 @@ var Server = function () {
     self.announcement = null;
     self.infogetter = null;
     self.servers = {};
-    self.ioServers = {};
 
     // database init ------------------------------------------------------
     var Database = require("./database");
@@ -207,9 +207,7 @@ Server.prototype.announce = function (data) {
     } else {
         this.announcement = data;
         db.setAnnouncement(data);
-        for (var id in this.ioServers) {
-            this.ioServers[id].sockets.emit("announcement", data);
-        }
+        sio.instance.emit("announcement", data);
     }
 };