diff --git a/Makefile.am b/Makefile.am
index 8aa64302b7893aa1f07bc52c4dace423c7cd4f59..5f369a649d3edada789d7c469db68f6daac64794 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,6 +144,7 @@ docrst = \
 	doc/admin.rst \
 	doc/design-2.0.rst \
 	doc/design-2.1.rst \
+	doc/design-2.2.rst \
 	doc/devnotes.rst \
 	doc/glossary.rst \
 	doc/hooks.rst \
diff --git a/doc/design-2.2.rst b/doc/design-2.2.rst
new file mode 100644
index 0000000000000000000000000000000000000000..cc78b5147b608d677f37a997c793a7e70f75923a
--- /dev/null
+++ b/doc/design-2.2.rst
@@ -0,0 +1,42 @@
+=================
+Ganeti 2.2 design
+=================
+
+This document describes the major changes in Ganeti 2.2 compared to
+the 2.1 version.
+
+The 2.2 version will be a relatively small release. Its main aim is to
+avoid changing too much of the core code, while addressing issues and
+adding new features and improvements over 2.1, in a timely fashion.
+
+.. contents:: :depth: 4
+
+Objective
+=========
+
+Background
+==========
+
+Overview
+========
+
+Detailed design
+===============
+
+As for 2.1 we divide the 2.2 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 :
diff --git a/doc/index.rst b/doc/index.rst
index dcd2ad22d2648ccb78a64dec312afdb9d7b5054e..0d1e1c037a25dd935dbebd47a6f53c83a9f321fc 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -16,6 +16,7 @@ Contents:
    security.rst
    design-2.0.rst
    design-2.1.rst
+   design-2.2.rst
    locking.rst
    hooks.rst
    iallocator.rst