diff --git a/docsrc/conf.py b/docsrc/conf.py
index ef6b78f8b6..d478c03fd0 100644
--- a/docsrc/conf.py
+++ b/docsrc/conf.py
@@ -97,9 +97,9 @@
 # May need to also update toplevel index.rst to point to other versions.
 #
 # The short X.Y version.
-version = '3.0.17'
+version = '3.0.18'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.17'
+release = '3.0.18'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -429,10 +429,10 @@
 # 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.2.9
-.. |imap_last_stable_branch| replace:: `cyrus-imapd-3.2`
-.. |imap_current_stable_version| replace:: 3.4.3
-.. |imap_current_stable_branch| replace:: `cyrus-imapd-3.4`
+.. |imap_last_stable_version| replace:: 3.4.5
+.. |imap_last_stable_branch| replace:: `cyrus-imapd-3.4`
+.. |imap_current_stable_version| replace:: 3.6.1
+.. |imap_current_stable_branch| replace:: `cyrus-imapd-3.6`
 .. |imap_latest_development_version| replace:: 3.7.0-alpha0
 .. |imap_latest_development_branch| replace:: master
 .. |imap_tikanga_stock_version| replace:: 2.3.7
@@ -446,7 +446,7 @@
 .. |sasl_current_stable_version| replace:: 2.1.28
 .. |imap_stable_release_notes| raw:: html
 
-    <a href="3.4/x/3.4.3.html">3.4.3</a>
+    <a href="3.6/x/3.6.1.html">3.6.1</a>
 
 .. |imap_development_release_notes| raw:: html