diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6792fdb..e4cbfa0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased][unreleased]
 
+## [0.2.1] - 2019-03-28
+
+### Changed
+
+ - Increased the minimum `league/commonmark` version due to a now-fixed bug with `Text` collapsing (#10)
+
 ## [0.2.0] - 2019-03-16
 
 This release brings the email and URL autolink processors into alignment with the official GFM spec.
@@ -29,6 +35,7 @@ This release brings the email and URL autolink processors into alignment with th
 
 Initial release!
 
-[unreleased]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v0.2.0...HEAD
+[unreleased]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/thephpleague/commonmark-ext-autolink/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/thephpleague/commonmark-ext-autolink/commits/v0.1.0
diff --git a/composer.json b/composer.json
index dcf5d48..aee7f69 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     ],
     "require": {
         "php" : "^5.6||^7.0",
-        "league/commonmark": "^0.18.2"
+        "league/commonmark": "^0.18.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7.27"
diff --git a/tests/UrlAutolinkProcessorTest.php b/tests/UrlAutolinkProcessorTest.php
index a3a0a21..3132fbd 100644
--- a/tests/UrlAutolinkProcessorTest.php
+++ b/tests/UrlAutolinkProcessorTest.php
@@ -69,5 +69,8 @@ public function dataProviderForAutolinkTests()
 
         // Test that < immediately terminates an autolink
         yield ['www.commonmark.org/he<lp', '<p><a href="http://www.commonmark.org/he">www.commonmark.org/he</a>&lt;lp</p>'];
+
+        // Regression: two links with one underscore each
+        yield ["https://eventum.example.net/history.php?iss_id=107092\nhttps://gitlab.example.net/group/project/merge_requests/39#note_150630", "<p><a href=\"https://eventum.example.net/history.php?iss_id=107092\">https://eventum.example.net/history.php?iss_id=107092</a>\n<a href=\"https://gitlab.example.net/group/project/merge_requests/39#note_150630\">https://gitlab.example.net/group/project/merge_requests/39#note_150630</a></p>"];
     }
 }