diff --git a/composer.json b/composer.json
index 91380ccd2ca39434034cbe947e9b725ea814c506..b1fe7c94c867f9baed1a6f2634b67d1eec465c19 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,7 @@
     "keywords": [ "saml2", "shibboleth","oauth","ws-federation","sp","idp" ],
     "homepage": "http://simplesamlphp.org",
     "license": "LGPL-2.1-or-later",
-    "version": "v1.18.6",
+    "version": "v1.18.7",
     "authors": [
         {
             "name": "Andreas Ă…kre Solberg",
diff --git a/composer.lock b/composer.lock
index 6bb546fb3aadc93cb9bc5df200c28a86eac9f14b..71621a69c5d0f3e13c102136e14f95ce2b706d8f 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "46ba8121006ea847ff1c885cd4995532",
+    "content-hash": "27c9966878bf09243ab1ca6e19a60e6c",
     "packages": [
         {
             "name": "gettext/gettext",
diff --git a/docs/simplesamlphp-changelog.md b/docs/simplesamlphp-changelog.md
index 52f1fefd70f67dba0c58af7cb584684558b6b77e..41156939df89ceeaee1e4c951dd343cacd71fdda 100644
--- a/docs/simplesamlphp-changelog.md
+++ b/docs/simplesamlphp-changelog.md
@@ -8,7 +8,7 @@ See the upgrade notes for specific information about upgrading.
 
 ## Version 1.18.7
 
-Released TBD
+Released 2020-05-12
 
   * Fix spurious warnings when session_create_id() fails to create ID (#1291)
   * Fix inconsistency in the way PATH_INFO is being used (#1227).
diff --git a/extra/simplesamlphp.spec b/extra/simplesamlphp.spec
index 33b78a9d5687eca2b44282b2611c614d5ebe7ed6..1f25819ef30f34d809709e957a43a19610810644 100644
--- a/extra/simplesamlphp.spec
+++ b/extra/simplesamlphp.spec
@@ -1,6 +1,6 @@
 %define name      simplesamlphp
 %define summary   SAML IDP/SP written in PHP
-%define version   1.18.6
+%define version   1.18.7
 %define release   1
 %define license   LGPL 2.1
 %define group     Networking/WWW
diff --git a/lib/SimpleSAML/Configuration.php b/lib/SimpleSAML/Configuration.php
index e4fd5d44e142d927e7500e020de09e6a4a8b4c50..18a0bb91a4cd52ba4d3bd28af9d4f2a28f59cefa 100644
--- a/lib/SimpleSAML/Configuration.php
+++ b/lib/SimpleSAML/Configuration.php
@@ -426,7 +426,7 @@ class Configuration implements Utils\ClearableState
      */
     public function getVersion()
     {
-        return '1.18.6';
+        return '1.18.7';
     }