diff --git a/docs/index.txt b/docs/index.txt
index c0bd2e44c927438e462fbe77f6064089218b1fe5..b2eba5e993311ea9fa0d7989b9d38d851252b983 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -2,6 +2,7 @@ SimpleSAMLphp Documentation
 ===========================
 
  * [Installing simpleSAMLphp](simplesamlphp-install)
+    * [Upgrade notes for version 1.8](simplesamlphp-upgrade-notes-1.8)
     * [Upgrade notes for version 1.7](simplesamlphp-upgrade-notes-1.7)
     * [Upgrade notes for version 1.6](simplesamlphp-upgrade-notes-1.6)
     * [Upgrade notes for version 1.5](simplesamlphp-upgrade-notes-1.5)
diff --git a/docs/simplesamlphp-changelog.txt b/docs/simplesamlphp-changelog.txt
index fa49d3fcc5410cecd609650e653c0de36232f80c..3756d9065d8f0d3133c776197644bd1c661978d8 100644
--- a/docs/simplesamlphp-changelog.txt
+++ b/docs/simplesamlphp-changelog.txt
@@ -6,6 +6,51 @@ simpleSAMLphp changelog
 This document lists the changes between versions of simpleSAMLphp.
 See the upgrade notes for specific information about upgrading.
 
+## Version 1.8
+
+  * New authentication modules:
+      * [`authmyspace`](./authmyspace:oauthmyspace)
+      * [`authlinkedin`](./authlinkedin:oauthlinkedin)
+      * [`authwindowslive`](./authwindowslive:windowsliveid)
+  * Support for custom error handler, replacing the default display function.
+  * Allow error codes to be defined in modules.
+  * Better control of logout what we do after logout request.
+      * This makes it possible for the SP to display a warning when receiving a PartialLogout response from the IdP.
+  * New `cdc` module, for setting and reading common domain cookies.
+
+### `consent`
+
+  * Support for disabling consent for some attributes.
+
+### `ldap`
+
+  * `ldap:AttributeAddFromLDAP`: Extract values from multiple matching entries.
+
+### `oauth`
+
+  * Added support for:
+      * RSASHA1 signatures
+      * consent
+      * callbackurl
+      * verifier code
+      * request parameters
+
+### `openid`
+
+  * Support for sending custom extension arguments (e.g. UI extensions).
+
+### `saml`
+
+  * Extract Extensions from AuthnRequest for use by custom modules when authenticating.
+  * Allow signing of SP metadata.
+  * Better control over NameIDPolicy when sending AuthnRequest.
+  * Support encrypting/decrypting NameID in LogoutRequest.
+  * Option to disable client certificate in SOAP client.
+  * Better selection of AssertionConsumerService endpoint based on parameters in AuthnRequest.
+  * Set NotOnOrAfter in IdP LogoutRequest.
+  * Only return PartialLogout from the IdP.
+
+
 ## Version 1.7
 
   * New authentication modules:
diff --git a/docs/simplesamlphp-upgrade-notes-1.8.txt b/docs/simplesamlphp-upgrade-notes-1.8.txt
new file mode 100644
index 0000000000000000000000000000000000000000..75c9b3b29ad732994015e8dc2462b08e1ac3ff12
--- /dev/null
+++ b/docs/simplesamlphp-upgrade-notes-1.8.txt
@@ -0,0 +1,9 @@
+Upgrade notes for simpleSAMLphp 1.8
+===================================
+
+  * The IdP now sends the NotOnOrAfter attribute in LogoutRequest messages.
+  * We now have full support for selecting the correct AssertionConsumerService endpoint based on parameters in the authentication request.
+    As a side effect of this, an IdP may start sending responses to a new AssertionConsumerService endpoint after upgrade.
+    (This should only happen in the case where it sent the response to the wrong endpoint before.)
+  * The SP no longer incorrectly returns PartialLogout as a status code in a LogoutResponse after the local session has expired.
+