diff --git a/js/app.js b/js/app.js
index fe26622..2867459 100644
--- a/js/app.js
+++ b/js/app.js
@@ -6,6 +6,7 @@
     App.Peer = Ember.Object.extend({
         uuid: null,
         email: null,
+        public_ip: null,
 
         peer: Ember.Object.create({
             id: null,
diff --git a/js/filedrop-room.js b/js/filedrop-room.js
index 0b020ac..cd1cb48 100644
--- a/js/filedrop-room.js
+++ b/js/filedrop-room.js
@@ -16,7 +16,10 @@ FileDrop.Room.prototype.join = function (user) {
 
         self.name = data.name,
 
-        $.extend(user, {uuid: data.uuid});
+        $.extend(user, {
+            uuid: data.uuid,
+            public_ip: data.public_ip
+        });
 
         socket.emit('join', {
             room: self.name,
diff --git a/server.js b/server.js
index 14dfaa2..318a077 100644
--- a/server.js
+++ b/server.js
@@ -44,7 +44,8 @@ app.get('/room', function (req, res) {
 
     res.json({
         name: name,
-        uuid: uuid.v1()
+        uuid: uuid.v1(),
+        public_ip: ip
     });
 });