diff --git a/.vitepress/config.js b/.vitepress/config.js
index d75a5229c..48541fc75 100644
--- a/.vitepress/config.js
+++ b/.vitepress/config.js
@@ -9,6 +9,7 @@ const base = '/2.4'
 const base_url = 'https://doc.dovecot.org'
 
 export const dovecotConfig = {
+	base_url: base_url,
 	data_paths: {
 		doveadm: '../data/doveadm.js',
 		event_categories: '../data/event_categories.js',
diff --git a/.vitepress/theme/DovecotLayout.vue b/.vitepress/theme/DovecotLayout.vue
index 9e7f603ca..43b8c903d 100644
--- a/.vitepress/theme/DovecotLayout.vue
+++ b/.vitepress/theme/DovecotLayout.vue
@@ -2,12 +2,26 @@
 import DefaultTheme from 'vitepress/theme'
 import { useData } from 'vitepress'
 
-const { theme } = useData()
+const { site, theme } = useData()
 const { Layout } = DefaultTheme
+
+const re = new RegExp("^[/][0-9.]+[/]?$")
+const prod = re.test(site._value.base)
+const latest = site._value.themeConfig.dovecot.base_url + "/latest/"
+
 </script>
 
 <template>
  <Layout>
+  <template #doc-before v-if="!prod">
+   <div class="container custom-block warning large">
+    <p>
+     Note: This is pre-release documentation.<br/>
+     Please access <a :href="latest" target="_blank">{{ latest }}</a> for documentation on released versions.
+    </p>
+   </div>
+  </template>
+
   <template #doc-footer-before>
    <div class="edit-info">
     <div :class="'edit-rev edit-rev-' + theme.dovecot.gitrev.align">
diff --git a/.vitepress/theme/custom.css b/.vitepress/theme/custom.css
index 79e6aa221..381c94959 100644
--- a/.vitepress/theme/custom.css
+++ b/.vitepress/theme/custom.css
@@ -65,3 +65,9 @@ section.VPSidebarItem.level-0:not(.collapsible) {
     padding-left: 0px !important;
   }
 }
+
+.large {
+  font-size: 20pt;
+  margin-bottom: 1em;
+  line-height: 125%;
+}