diff --git a/docsrc/conf.py b/docsrc/conf.py
index 757ccc4bae..afd6b15e36 100644
--- a/docsrc/conf.py
+++ b/docsrc/conf.py
@@ -431,7 +431,7 @@
 # When this is updated, you may also need to update the version and release
 # definitions listed above to stay up to date.
 rst_prolog = """
-.. |imap_last_stable_version| replace:: 3.10.0
+.. |imap_last_stable_version| replace:: 3.10.1
 .. |imap_last_stable_branch| replace:: `cyrus-imapd-3.8`
 .. |imap_current_stable_version| replace:: 3.12.0-alpha0
 .. |imap_current_stable_branch| replace:: `cyrus-imapd-3.12`
diff --git a/docsrc/imap/download/release-notes/3.10/x/3.10.1.rst b/docsrc/imap/download/release-notes/3.10/x/3.10.1.rst
new file mode 100644
index 0000000000..5045634726
--- /dev/null
+++ b/docsrc/imap/download/release-notes/3.10/x/3.10.1.rst
@@ -0,0 +1,47 @@
+:tocdepth: 3
+
+===============================
+Cyrus IMAP 3.10.1 Release Notes
+===============================
+
+Download from GitHub:
+
+    *   https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.10.1/cyrus-imapd-3.10.1.tar.gz
+    *   https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.10.1/cyrus-imapd-3.10.1.tar.gz.sig
+
+.. _relnotes-3.10.1-changes:
+
+Changes since 3.10.0
+====================
+
+Build changes
+-------------
+
+* Fixed :issue:`5029`: check for unexpected extra tiny-tests directories
+* Fixed :issue:`5148`: added ``--enable-release-checks`` configure option
+  for use when building releases
+
+Documentation build changes
+---------------------------
+
+The documentation build now uses the theme from Read the Docs, rather than
+an old custom one.  This resolves incompatibilities between the old custom
+CSS and newer versions of Sphinx.
+
+If you wish to (re)build the documentation, you will need to have the python
+module "sphinx_rtd_theme" available.  On Debian, this is in the
+python3-sphinx-rtd-theme package.
+
+Bug fixes
+---------
+
+* Fixed :issue:`4489`: calendar-color "changes" namespace (thanks Дилян
+  Палаузов)
+* Fixed :issue:`5009`: various portability warnings and nits
+* Fixed :issue:`5027`: inverse sign when guessing Etc/GMT+X timezone
+* Fixed :issue:`5050`: iTIP line endings (thanks Дилян Палаузов)
+* Fixed :issue:`5052`: iMIP line endings (thanks Дилян Палаузов)
+* Fixed :issue:`5072`: http_cgi use after free (thanks Дилян Палаузов)
+* Fixed :issue:`5094`: httpd crash when PROPFIND url is /dav/calendars
+* Fixed :issue:`5118`: broken language checks for "zr-hant" and "sr-me"
+* Fixed :issue:`5047`: proxying UID SEARCH
diff --git a/docsrc/imap/download/release-notes/3.6/x/3.6.7.rst b/docsrc/imap/download/release-notes/3.6/x/3.6.7.rst
new file mode 100644
index 0000000000..9d4abb7daa
--- /dev/null
+++ b/docsrc/imap/download/release-notes/3.6/x/3.6.7.rst
@@ -0,0 +1,43 @@
+:tocdepth: 3
+
+==============================
+Cyrus IMAP 3.6.7 Release Notes
+==============================
+
+Download from GitHub:
+
+* https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.6.7/cyrus-imapd-3.6.7.tar.gz
+* https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.6.7/cyrus-imapd-3.6.7.tar.gz.sig
+
+.. _relnotes-3.6.7-changes:
+
+Changes since 3.6.6
+===================
+
+Build changes
+-------------
+
+* Fixed :issue:`5029`: check for unexpected extra tiny-tests directories
+* Fixed :issue:`5148`: added ``--enable-release-checks`` configure option
+  for use when building releases
+
+Documentation build changes
+---------------------------
+
+The documentation build now uses the theme from Read the Docs, rather than
+an old custom one.  This resolves incompatibilities between the old custom
+CSS and newer versions of Sphinx.
+
+If you wish to (re)build the documentation, you will need to have the python
+module "sphinx_rtd_theme" available.  On Debian, this is in the
+python3-sphinx-rtd-theme package.
+
+Bug fixes
+---------
+
+* Fixed :issue:`4848`: relocate_by_id - fatal error: Unknown meta file
+  requested
+* Fixed :issue:`5050`: iTIP line endings (thanks Дилян Палаузов)
+* Fixed :issue:`5052`: iMIP line endings (thanks Дилян Палаузов)
+* Fixed :issue:`5072`: http_cgi use after free (thanks Дилян Палаузов)
+* Fixed :issue:`5118`: broken language checks for "zr-hant" and "sr-me"
diff --git a/docsrc/imap/download/release-notes/3.8/x/3.8.5.rst b/docsrc/imap/download/release-notes/3.8/x/3.8.5.rst
new file mode 100644
index 0000000000..4a362c99de
--- /dev/null
+++ b/docsrc/imap/download/release-notes/3.8/x/3.8.5.rst
@@ -0,0 +1,46 @@
+:tocdepth: 3
+
+==============================
+Cyrus IMAP 3.8.5 Release Notes
+==============================
+
+Download from GitHub:
+
+* https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.8.5/cyrus-imapd-3.8.5.tar.gz
+* https://github.com/cyrusimap/cyrus-imapd/releases/download/cyrus-imapd-3.8.5/cyrus-imapd-3.8.5.tar.gz.sig
+
+.. _relnotes-3.8.5-changes:
+
+Changes since 3.8.4
+===================
+
+Build changes
+-------------
+
+* Fixed :issue:`5029`: check for unexpected extra tiny-tests directories
+* Fixed :issue:`5148`: added ``--enable-release-checks`` configure option
+  for use when building releases
+
+Documentation build changes
+---------------------------
+
+The documentation build now uses the theme from Read the Docs, rather than
+an old custom one.  This resolves incompatibilities between the old custom
+CSS and newer versions of Sphinx.
+
+If you wish to (re)build the documentation, you will need to have the python
+module "sphinx_rtd_theme" available.  On Debian, this is in the
+python3-sphinx-rtd-theme package.
+
+Bug fixes
+---------
+
+* Fixed :issue:`4489`: calendar-color "changes" namespace (thanks Дилян
+  Палаузов)
+* Fixed :issue:`5009`: various portability warnings and nits
+* Fixed :issue:`5050`: iTIP line endings (thanks Дилян Палаузов)
+* Fixed :issue:`5052`: iMIP line endings (thanks Дилян Палаузов)
+* Fixed :issue:`5072`: http_cgi use after free (thanks Дилян Палаузов)
+* Fixed :issue:`5094`: httpd crash when PROPFIND url is /dav/calendars
+* Fixed :issue:`5118`: broken language checks for "zr-hant" and "sr-me"
+* Fixed :issue:`5047`: proxying UID SEARCH
diff --git a/lib/imapoptions b/lib/imapoptions
index 09c101047e..ad1d694797 100644
--- a/lib/imapoptions
+++ b/lib/imapoptions
@@ -1751,7 +1751,7 @@ Blank lines and lines beginning with ``#'' are ignored.
 /* Maximum number of logged in sessions allowed per user,
    zero means no limit. */
 
-{ "maxargssize", "0", BYTESIZE, "3.12.0" }
+{ "maxargssize", "0", BYTESIZE, "3.10.0" }
 /* Maximum total size of arguments to an IMAP command that will be
    accepted by Cyrus.
    Commands with arguments that exceed this limit will be rejected. 
@@ -1769,7 +1769,7 @@ Blank lines and lines beginning with ``#'' are ignored.
 .PP
    If no unit is specified, bytes is assumed. */
 
-{ "maxliteral", "128K", BYTESIZE, "3.12.0" }
+{ "maxliteral", "128K", BYTESIZE, "3.10.0" }
 /* Maximum size of a single literal allowed by the IMAP parser.
 .PP
    If set to 0, a large internally-defined limit will be applied.