diff --git a/docs/source/changelog.md b/docs/source/changelog.md
index 84e3debd..7cccb77f 100644
--- a/docs/source/changelog.md
+++ b/docs/source/changelog.md
@@ -57,6 +57,14 @@ Other new features:
 - new Admin page, written in React.
   With RBAC, it should now be fully possible to implement a custom admin panel
   as a service via the REST API.
+- JupyterLab is the default UI for single-user servers,
+  if available in the user environment.
+  See [more info](classic-notebook-ui)
+  in the docs about switching back to the classic notebook,
+  if you are not ready to switch to JupyterLab.
+- NullAuthenticator is now bundled with JupyterHub,
+  so you no longer need to install the `nullauthenticator` package to disable login,
+  you can set `c.JupyterHub.authenticator_class = 'null'`.
 - Support `jupyterhub --show-config` option to see your current jupyterhub configuration.
 - Add expiration date dropdown to Token page
 
diff --git a/docs/source/reference/config-user-env.md b/docs/source/reference/config-user-env.md
index f1e9ef05..a8328a44 100644
--- a/docs/source/reference/config-user-env.md
+++ b/docs/source/reference/config-user-env.md
@@ -189,6 +189,8 @@ The number of named servers per user can be limited by setting
 c.JupyterHub.named_server_limit_per_user = 5
 ```
 
+(classic-notebook-ui)=
+
 ## Switching back to classic notebook
 
 By default the single-user server launches JupyterLab,