diff --git a/HISTORY.rst b/HISTORY.rst
index 72b6364dfb..e324c7c9f0 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,3 +1,10 @@
+3.2.1 (2019-06-14)
+==================
+* Fix sub cabinet creation view. Thanks to Frédéric Sheedy
+  (@fsheedy) for the report.
+* Add PostgreSQL troubleshooting entry. Closes GitLab
+  issues #523 and #602
+
 3.2 (2019-06-13)
 ================
 * Split sources models into separate modules.
diff --git a/docs/releases/3.2.1.rst b/docs/releases/3.2.1.rst
index cf76e70b1a..7c4c790c0e 100644
--- a/docs/releases/3.2.1.rst
+++ b/docs/releases/3.2.1.rst
@@ -98,6 +98,8 @@ Backward incompatible changes
 Bugs fixed or issues closed
 ---------------------------
 
+- :gitlab-issue:`523` PostgreSQL error about insufficient connections
 - :gitlab-issue:`601` Error when creating new cabinet level
+- :gitlab-issue:`602` System stops responding for a minute every 10 minutes or so
 
 .. _PyPI: https://pypi.python.org/pypi/mayan-edms/