diff --git a/docs/index.txt b/docs/index.txt
index 3ce5c8de1c534a4fa2b2bd08ac8e0297f4f0c60f..effe46353b58fb6c99f99c3e84fb0c9cde75bfc8 100644
--- a/docs/index.txt
+++ b/docs/index.txt
@@ -2,6 +2,7 @@ SimpleSAMLphp Documentation
 ===========================
 
  * [Installing simpleSAMLphp](simplesamlphp-install)
+    * [Upgrade notes for version 1.10](simplesamlphp-upgrade-notes-1.10)
     * [Upgrade notes for version 1.9](simplesamlphp-upgrade-notes-1.9)
     * [Upgrade notes for version 1.8](simplesamlphp-upgrade-notes-1.8)
     * [Upgrade notes for version 1.7](simplesamlphp-upgrade-notes-1.7)
diff --git a/docs/simplesamlphp-changelog.txt b/docs/simplesamlphp-changelog.txt
index d19f0190a89fc6fb3569b4ea2ae7678976efa7f4..88396316b700bdf5d119ce21f834abca09bc1829 100644
--- a/docs/simplesamlphp-changelog.txt
+++ b/docs/simplesamlphp-changelog.txt
@@ -6,6 +6,29 @@ simpleSAMLphp changelog
 This document lists the changes between versions of simpleSAMLphp.
 See the upgrade notes for specific information about upgrading.
 
+## Version 1.10
+
+Released TBD.
+
+  * Add support for storing data without expiration timestamp in memcache.
+  * Fix for reauthentication in old shib13 authentication handler.
+  * Clean up executable-permissions on files.
+  * Change encryption to use the rsa-oaep-mgf1p key padding instead of PKCS 1.5.
+  * Update translations.
+
+### `core`
+
+  * `core:UserPass(Org)Base`: Add "remember username" option.
+
+### `riak`
+
+  * New module for storing sessions in a Riak database.
+
+### `saml`
+
+  * Add support for overriding SAML 2.0 SP authentication request generation.
+  * Add support for blacklisting encryption algorithms.
+
 ## Version 1.9.1
 
 Released 2012-08-02.
diff --git a/docs/simplesamlphp-upgrade-notes-1.10.txt b/docs/simplesamlphp-upgrade-notes-1.10.txt
new file mode 100644
index 0000000000000000000000000000000000000000..18e9a66e296c4eb7ff28f9b341411423cdc7d742
--- /dev/null
+++ b/docs/simplesamlphp-upgrade-notes-1.10.txt
@@ -0,0 +1,4 @@
+Upgrade notes for simpleSAMLphp 1.10
+====================================
+
+  * The default encryption key padding scheme has been changed to `http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p`. This may cause problems if the recipient of messages do not support this padding scheme.