diff --git a/Gemfile.lock b/Gemfile.lock
index b4fc7153..4caba292 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -119,7 +119,7 @@ GEM
       activesupport (>= 4.2.0)
     highline (2.0.3)
     htmlentities (4.3.4)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.33)
       activesupport (>= 4.0.2)
@@ -159,14 +159,15 @@ GEM
     mime-types-data (3.2020.1104)
     mimemagic (0.3.5)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.2)
     minitest-stub-const (0.6)
     mocha (1.12.0)
     mysql2 (0.5.3)
     nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    nokogiri (1.11.0)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
     nokogumbo (2.0.4)
       nokogiri (~> 1.8, >= 1.8.4)
     paperclip (6.1.0)
@@ -181,6 +182,7 @@ GEM
     pg (1.2.3)
     puma (5.1.1)
       nio4r (~> 2.0)
+    racc (1.5.2)
     rack (2.2.3)
     rack-mini-profiler (2.3.0)
       rack (>= 1.2.0)
@@ -244,9 +246,9 @@ GEM
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.3.0)
+    rubocop-ast (1.4.0)
       parser (>= 2.7.1.5)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     safe_yaml (1.0.5)
     sanitize (5.2.1)
       crass (~> 1.0.2)
diff --git a/config/initializers/tracks.rb b/config/initializers/tracks.rb
index 4acabf49..a114fafa 100644
--- a/config/initializers/tracks.rb
+++ b/config/initializers/tracks.rb
@@ -1,4 +1,4 @@
-tracks_version='2.5.1'
+tracks_version='2.5.2'
 # comment out next two lines if you do not want (or can not) the date of the
 # last git commit in the footer
 info=`git log --pretty=format:"%ai" -1`
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 9a0c50a5..b2223cef 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -1,5 +1,23 @@
 See doc/upgrading.md for the upgrade documentation!
 
+## Version 2.5.2
+
+### New features
+
+* New Finnish locale by the maintainer Jyri-Petteri ”ZeiP” Paloposki.
+* Update last login field when validating an existing login.
+* Show more users in the user list and allow changing the order criteria.
+
+### Bug fixes
+
+* Fix tag-specific task lists to work in a multi-user environment.
+* Fix setting the due date in the calendar view.
+* Fix a bug causing 500 errors for users with different locales.
+* Lots of dependencies have been upgraded.
+* Better CI tests.
+* Code style fixes.
+* Small style issues.
+
 ## Version 2.5.1
 
 ### Security issue disclosure