diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd5b96f8f..a2610dc1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,20 @@
 # History
+## 6.0.0
+- CommonJs to ESM (.mjs)
+- support for mashlib >= 2.0.0
+- support solid-OIDC with WebID scope, es256, and rfc9702
+
+## 6.0.0 Upgrade Notes
+
+1.0 Automatically recreated
+- delete `.db/oidc/op/provider.json`
+- delete `config/templates/emails`
+  If not recreated then copy from `default-emails`
+  If there was some personalisation these need to be redone
+
+2.0 Manuel update the `index.html` in server root `data/<serverOrigin>/index.html`
+  edit `common/js/index-buttons.js` to `index-buttons.mjs`
+  
 ## 5.3.0
 - Support for webid-oidc with DPop tokens
 
diff --git a/README.md b/README.md
index 514c44ebf..7f760c0a1 100644
--- a/README.md
+++ b/README.md
@@ -146,6 +146,9 @@ also add to `config.json`
   "emailAuthPass": "gmailPass"
 ```
 
+### Upgrading from version <6.0.0
+Please take into account the [v6.0.0 upgrade notes](https://github.com/solid/node-solid-server/blob/master/CHANGELOG.md#600-upgrade-notes).
+
 ### Upgrading from version <5.3
 Please take into account the [v5.3 upgrade notes](https://github.com/solid/node-solid-server/blob/master/CHANGELOG.md#530-upgrade-notes).