diff --git a/Makefile b/Makefile
index 45407702..29d86c67 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,9 @@ MANDIR=doc/man
 MANGENERATED=$(MANDIR)/cdist-reference.text
 
 MANSRC=$(MANDIR)/cdist.text						\
-	$(MANDIR)/cdist-code-run-all.text			\
+	$(MANDIR)/cdist-best-practise.text			\
 	$(MANDIR)/cdist-code-run.text					\
+	$(MANDIR)/cdist-code-run-all.text			\
 	$(MANDIR)/cdist-config.text 					\
    $(MANDIR)/cdist-dir.text         			\
    $(MANDIR)/cdist-env.text         			\
@@ -29,8 +30,8 @@ MANSRC=$(MANDIR)/cdist.text						\
 	$(MANDIR)/cdist-explorer.text					\
 	$(MANDIR)/cdist-manifest.text 				\
 	$(MANDIR)/cdist-manifest-run.text			\
-   $(MANDIR)/cdist-manifest-run-init.text		\
    $(MANDIR)/cdist-manifest-run-all.text	 	\
+   $(MANDIR)/cdist-manifest-run-init.text		\
 	$(MANDIR)/cdist-object-explorer-all.text	\
 	$(MANDIR)/cdist-object-gencode.text    	\
 	$(MANDIR)/cdist-object-gencode-all.text	\
diff --git a/doc/dev/todo/niconext b/doc/dev/todo/niconext
index fd604139..fe7125b5 100644
--- a/doc/dev/todo/niconext
+++ b/doc/dev/todo/niconext
@@ -1,6 +1,6 @@
-Further Documentation: (probably cdist-best-practises?)
-   - Describe Multi master setups
-   - use ssh with master socket?
+Write cdist-best-practise:
+   - Multi master setups
+   - ssh with master socket?
       - saves connection delay for new connections: -M
       - hint: http://protempore.net/~calvins/howto/ssh-connection-sharing/
    - Different environments (production, integration, development)
diff --git a/doc/man/cdist-best-practise.text b/doc/man/cdist-best-practise.text
new file mode 100644
index 00000000..159da51d
--- /dev/null
+++ b/doc/man/cdist-best-practise.text
@@ -0,0 +1,23 @@
+cdist-best-practise(1)
+======================
+Nico Schottelius <nico-cdist--@--schottelius.org>
+
+NAME
+----
+cdist-best-practise - Practises used in real environments
+
+
+TOPIC1
+------
+
+
+
+SEE ALSO
+--------
+- cdist(7)
+
+
+COPYING
+-------
+Copyright \(C) 2011 Nico Schottelius. Free use of this software is
+granted under the terms of the GNU General Public License version 3 (GPLv3).