diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 2fa5ed355913cffad3b6565e0aa3de807eecd4b6..4fe7c5c087a6906420ef8e212266571a3abc6984 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,102 +1,137 @@
 Changelog
 =========
 
-`2.0a2`_
---------
+`2.0b0`_ - 2021-05-21
+---------------------
 
-New features
-~~~~~~~~~~~~
+Added
+~~~~~
 
-* Header box with absent and affected teachers and groups
-* Provide smart plan for current day as dashboard widget
-* Roles and permissions for timetable and lists
-* Show events in timetable
-* Show exams in timetable
-* Show holidays in timetable
-* Show supervision substitutions in timetable and list
+* Introduce validity range and link data to validity ranges.
+* Add option to link subjects to groups
+* Add search indices for rooms.
+* Show week version of smart timetable on desktop devices.
+* Add PDF export function for regular timetables.
 
-Minor changes
-~~~~~~~~~~~~~
+Changed
+~~~~~~~
 
-* Improve handling of different types (substitutions, timetables,…)
-* Improve view for groups in timetable views
-* More intelligent personal timetable (checks if current person is teacher,…)
-* Show announcements in timetable views
-* Devs: Move prev/next function to models
-* Devs: Rename field abbrev to short_name
+* Link week-related models not only to weeks, but also to years.
+* Optimise query count in timetable views.
+* Go to next week if current day is out of range (weekly timetable view).
+* Summarize double lessons in substitutions print view.
+* Show only parent groups in "Affected groups".
 
-Bug fixes
-~~~~~~~~~
+Fixed
+~~~~~
 
-* Force all lessons in timetable to same height
-* Render empty periods correctly
+* Do not show dates in regular timetable.
+* Show correct tooltip for rooms in substitution table.
+* Show extra lessons in which a person is the new teacher in "My timetable".
+* Show translations for weekdays.
+* Show absent teachers in substitutions plan.
+* Show supervisions in substitutions plan.
+* Sort teacher short names alphabetically.
+* Sort substitutions table by parent groups if displaying parent groups is activated.
+* Make previous/next lesson API functions independent of the validity range.
+* Show only regular elements in regular timetable, don't include information like holidays.
 
-`2.0a1`_
---------
+`2.0a2`_ - 2020-05-04
+---------------------
 
-New features
-~~~~~~~~~~~~
+Added
+~~~~~
 
-* Migrate to materialize.css
+* Header box with absent and affected teachers and groups.
+* Provide smart plan for current day as dashboard widget.
+* Roles and permissions for timetable and lists.
+* Show events in timetable.
+* Show exams in timetable.
+* Show holidays in timetable.
+* Show supervision substitutions in timetable and list.
 
-Minor changes
-~~~~~~~~~~~~~
+Changed
+~~~~~~~
 
-* Redesign filter ui for rooms, classes or teachers
-* Rename person timetabe for current day to „smart plan“
+* Improve handling of different types (substitutions, timetables,…).
+* Improve view for groups in timetable views.
+* More intelligent personal timetable (checks if current person is teacher,…).
+* Show announcements in timetable views.
+* Devs: Move prev/next function to models.
+* Devs: Rename field abbrev to short_name.
 
-Bug fixes
-~~~~~~~~~
+Fixed
+~~~~~
 
-* Catch error if no timetable data is available
+* Force all lessons in timetable to same height.
+* Render empty periods correctly.
 
+`2.0a1`_ - 2020-02-01
+---------------------
 
-`1.0a3`_
---------
+Added
+~~~~~
 
-New features
-~~~~~~~~~~~~
+* Migrate to MaterializeCSS
 
-* Add list of all future substitutions
-* Devs: Add API to get date of a period
+Changed
+~~~~~~~
 
+* Redesign filter ui for rooms, classes or teachers.
+* Rename person timetabe for current day to "smart plan".
 
-`1.0a2`_
---------
+Fixed
+~~~~~
 
-New features
-~~~~~~~~~~~~
+* Catch error if no timetable data is available.
 
-* Devs: LessonPeriod now has a custom QuerySet and manager for advanced filtering
 
-Bugfixes
-~~~~~~~~
+`1.0a3`_ - 2019-11-24
+---------------------
 
-* Room plan includes substituted lessons now
+Added
+~~~~~
 
+* Add list of all future substitutions.
+* Devs: Add API to get date of a period.
 
-`1.0a1`_
---------
 
-New features
-~~~~~~~~~~~~
+`1.0a2`_ - 2019-11-11
+---------------------
 
-* Support lesson cancellation
-* Devs: Add fully pythonic API for calendar weeks
+Added
+~~~~~
 
-Bugfixes
-~~~~~~~~
+* Devs: LessonPeriod now has a custom QuerySet and manager for advanced filtering.
 
-* Redirect to correct date after editing a substitution
-* Correctly display teachers for substituted lessons
+Fixed
+~~~~~
 
-Minor changes
-~~~~~~~~~~~~~
+* Room plan includes substituted lessons now.
 
-* Use bootstrap buttons everywhere
 
-_`1.0a1`: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/1.0a1
-_`1.0a2`: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/1.0a2
-_`1.0a3`: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/1.0a3
-_`2.0a1`: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0a1
-_`2.0a2`: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0a2
+`1.0a1`_ - 2019-09-17
+---------------------
+
+Added
+~~~~~
+
+* Support lesson cancellation.
+* Devs: Add fully pythonic API for calendar weeks.
+
+Fixed
+~~~~~
+
+* Redirect to correct date after editing a substitution.
+* Correctly display teachers for substituted lessons.
+* Use bootstrap buttons everywhere.
+
+.. _Keep a Changelog: https://keepachangelog.com/en/1.0.0/
+.. _Semantic Versioning: https://semver.org/spec/v2.0.0.html
+
+.. _1.0a1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/1.0a1
+.. _1.0a2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/1.0a2
+.. _1.0a3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/1.0a3
+.. _2.0a1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0a1
+.. _2.0a2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0a2
+.. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b0