diff --git a/README.md b/README.md
index 6578e55ef2..16f41fcb2b 100644
--- a/README.md
+++ b/README.md
@@ -256,6 +256,12 @@ To change the config.json for the desktop app, create a config file which will b
 
 In the paths above, `$NAME` is typically `Riot`, unless you use `--profile $PROFILE` in which case it becomes `Riot-$PROFILE`.
 
+Labs Features
+=============
+
+Some features of Riot may be enabled by flags in the `Labs` section of the settings.
+Some of these features are described in [labs.md](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md).
+
 Development
 ===========
 
diff --git a/docs/labs.md b/docs/labs.md
index 6c9b801f77..65b16edf90 100644
--- a/docs/labs.md
+++ b/docs/labs.md
@@ -1,8 +1,10 @@
 # riot-web Labs features
 
-Some notes on the features you can enable by going to `Settings->Labs`. Not exhaustive, chat in [#riot-web:matrix.org] for more information.
+Some notes on the features you can enable by going to `Settings->Labs`. Not exhaustive, chat in
+[#riot-web:matrix.org] for more information.
 
-**Be warned! Labs features are not finalised, they may be fragile, they may change, they may be dropped. Ask in the room if you are unclear about any details here.**
+**Be warned! Labs features are not finalised, they may be fragile, they may change, they may be
+dropped. Ask in the room if you are unclear about any details here.**
 
 ## Render simple counters in room header