diff --git a/docs/labs.md b/docs/labs.md
index c186eb590..795876302 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -112,6 +112,12 @@ theme definition.
 
 For some sample themes, check out [aaronraimist/riot-web-themes](https://github.com/aaronraimist/riot-web-themes).
 
+## New room list (`feature_new_room_list`) (in development)
+
+A complete rewrite of the room list is underway to increase performance, stability,
+and general usability. This is expected to take a while to complete and as such might
+be missing critical features - please use at your own risk, though do report bugs!
+
 ## IRC message layout (`feature_irc_ui`)
 
 Adds an option to change the message layout to an IRC style ` timestamp | avatar
diff --git a/riot.im/develop/config.json b/riot.im/develop/config.json
index cb378ce32..b5ad69547 100644
--- a/riot.im/develop/config.json
+++ b/riot.im/develop/config.json
@@ -24,6 +24,7 @@
         "feature_bridge_state": "labs",
         "feature_presence_in_room_list": "labs",
         "feature_custom_themes": "labs",
+        "feature_new_room_list": "labs",
         "feature_irc_ui": "labs"
     },
     "piwik": {