diff --git a/converse.js b/converse.js
index f0d610f21..04ba0362e 100644
--- a/converse.js
+++ b/converse.js
@@ -1790,9 +1790,16 @@
             },
 
             updateRoomsList: function () {
-                converse.connection.muc.listRooms(
-                    this.model.get('muc_domain'),
-                    $.proxy(function (iq) { // Success
+                /* Send and IQ stanza to the server asking for all rooms
+                 */
+                converse.connection.sendIQ(
+                    $iq({
+                        to: this.model.get('muc_domain'),
+                        from: converse.connection.jid,
+                        type: "get"
+                    }).c("query", {xmlns: Strophe.NS.DISCO_ITEMS}),
+                    // Succcess Handler
+                    $.proxy(function (iq) {
                         var name, jid, i, fragment,
                             that = this,
                             $available_chatrooms = this.$el.find('#available-chatrooms');
@@ -1821,9 +1828,8 @@
                         }
                         return true;
                     }, this),
-                    $.proxy(function (iq) { // Failure
-                        this.informNoRoomsFound();
-                    }, this));
+                    // Error handler
+                    $.proxy(function (iq) { this.informNoRoomsFound(); }, this));
             },
 
             showRooms: function (ev) {
diff --git a/spec/controlbox.js b/spec/controlbox.js
index 0cce4b318..2d553d6c3 100644
--- a/spec/controlbox.js
+++ b/spec/controlbox.js
@@ -1005,7 +1005,7 @@
                     expect(_.isEqual(new_attrs.sort(), old_attrs.sort())).toEqual(true);
                 }
             }, converse));
-            
+
             it("will show fullname and jid properties on tooltip", $.proxy(function () {
                 var jid, name, i, t;
                 for (i=0; i<mock.cur_names.length; i++) {
@@ -1019,7 +1019,7 @@
                     expect(dd_title).toContain(jid);
                 }
             }, converse));
-            
+
         }, converse));
     }, converse, mock, test_utils));
 
@@ -1112,6 +1112,12 @@
                     expect($('.chatroom:visible').length).toBe(1); // There should now be an open chatroom
                 }, converse));
             }, converse));
+
+            it("lists rooms currently on the server", $.proxy(function () {
+                // TODO: test updateRoomsList
+                // See: http://xmpp.org/extensions/xep-0045.html#disco-rooms
+            }, converse));
+
         }, converse));
     }, converse, mock, test_utils));
 }));