diff --git a/Makefile.am b/Makefile.am
index f1eba2d96d5027107e3393d4094d98eb08913c08..f2ab9b65c8d79f6fb51240cbeab3a748b177c9f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,6 +173,7 @@ docrst = \
 	doc/design-2.0.rst \
 	doc/design-2.1.rst \
 	doc/design-2.2.rst \
+	doc/design-2.3.rst \
 	doc/cluster-merge.rst \
 	doc/devnotes.rst \
 	doc/glossary.rst \
diff --git a/doc/design-2.3.rst b/doc/design-2.3.rst
new file mode 100644
index 0000000000000000000000000000000000000000..efd8bf254bf73deb6cf8c2b9ea15728282244549
--- /dev/null
+++ b/doc/design-2.3.rst
@@ -0,0 +1,36 @@
+=================
+Ganeti 2.3 design
+=================
+
+This document describes the major changes in Ganeti 2.3 compared to
+the 2.2 version.
+
+.. contents:: :depth: 4
+
+Detailed design
+===============
+
+As for 2.1 and 2.2 we divide the 2.3 design into three areas:
+
+- core changes, which affect the master daemon/job queue/locking or
+  all/most logical units
+- logical unit/feature changes
+- external interface changes (eg. command line, os api, hooks, ...)
+
+Core changes
+------------
+
+
+Feature changes
+---------------
+
+
+External interface changes
+--------------------------
+
+
+.. vim: set textwidth=72 :
+.. Local Variables:
+.. mode: rst
+.. fill-column: 72
+.. End:
diff --git a/doc/index.rst b/doc/index.rst
index 668c945b5016a8055068826ecf16306dba3f7901..80ae4c093d10250d24178162c73f09627fa6b6fc 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -17,6 +17,7 @@ Contents:
    design-2.0.rst
    design-2.1.rst
    design-2.2.rst
+   design-2.3.rst
    cluster-merge.rst
    locking.rst
    hooks.rst