diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd7bb1b..0d2fed3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,15 +16,12 @@ Pico Changelog
           `PicoDeprecated`'s changelog. Please note that BC-breaking changes
           are only possible with a new major version.
 
-### Version 3.0.0-alpha.1
-Released: 2020-03-29
+### Version 3.0.0-alpha.2
+Released: 2020-12-24
 
 ```
-* [New] Kick-start development of Pico 3.0
-* [Changed] Require PHP 7.0.8+
-* [Changed] Update dependencies: Twig 2.12, Symfony YAML 3.4, Parsedown 1.7.4
-            and Parsedown Extra 0.8.1; this is just an interim step, we'll
-            update to Twig 3.0+ and Symfony YAML 5.0+ later
+* [Changed] Merge all fixes of Pico v2.1.2 to v2.1.4
+* [Fixed] #575: Update Symfony YAML v3.4 to support PHP 8.0+
 ```
 
 ### Version 2.1.4
@@ -51,6 +48,17 @@ Released: 2020-04-10
 * [Fixed] Fix DummyPlugin declaring API version 3
 ```
 
+### Version 3.0.0-alpha.1
+Released: 2020-03-29
+
+```
+* [New] Kick-start development of Pico 3.0
+* [Changed] Require PHP 7.0.8+
+* [Changed] Update dependencies: Twig 2.12, Symfony YAML 3.4, Parsedown 1.7.4
+            and Parsedown Extra 0.8.1; this is just an interim step, we'll
+            update to Twig 3.0+ and Symfony YAML 5.0+ later
+```
+
 ### Version 2.1.1
 Released: 2019-12-31