diff --git a/docs/web/cdist.mdwn b/docs/web/cdist.mdwn
index fff727bf..ab501f56 100644
--- a/docs/web/cdist.mdwn
+++ b/docs/web/cdist.mdwn
@@ -30,38 +30,4 @@ cdist was tested or is know to run on at least
  * [Ubuntu](http://www.ubuntu.com/)
  * [XenServer](http://www.citrix.com/xenserver/)
 
-
-## Used by
-
-If you're using cdist, feel free to send a report to the mailing list.
-Interesting information are for instance
-
- * Which services do you manage?
- * How many machines do you manage?
- * What are the pros/cons you see in cdist?
- * General comments/critics
-
-### Nico Schottelius, Systems Group ETH Zurich, local.ch and privately
-
-Yes, I'm actually eating my own dogfood and currently managing
-
- * [plone](http://plone.org/) (cms)
- * [moinmoin](http://moinmo.in/) (wiki)
- * [apache](http://httpd.apache.org/) (webserver)
- * [kerberos (mit)](http://web.mit.edu/kerberos/) (authentication)
- * [nss-pam-ldapd](http://arthurdejong.org/nss-pam-ldapd/) (authentication)
- * [ircd-hybrid](http://www.ircd-hybrid.org/) (chat)
- * [stunnel](http://stunnel.mirt.net/) (SSL tunnel)
- * [mercurial-server](http://www.lshift.net/mercurial-server.html) (version control)
- * [xfce](http://www.xfce.org/) (lightweight desktop environment)
- * [slim](http://slim.berlios.de/) (graphical login manager for X11)
-
-with cdist on more than **60** production machines of the
-[Systems Group](http://www.systems.ethz.ch) at the
-[ETH Zurich](http://www.ethz.ch) as well at home.
-
-### Steven Armstrong, CBRG ETH Zurich
-
-The CBRG is managing most of their compute clusters with cdist.
-
 [[!tag cdist unix]]
diff --git a/docs/web/cdist/features.mdwn b/docs/web/cdist/features.mdwn
index c1fecb53..a97f2013 100644
--- a/docs/web/cdist/features.mdwn
+++ b/docs/web/cdist/features.mdwn
@@ -22,3 +22,5 @@ UNIX | Reuse of existing tools like cat, find, mv, ...
 UNIX, familar environment, documentation | Is available as manpages and HTML
 UNIX, simplicity, familar environment | cdist is configured in POSIX shell
 """]]
+
+[[!tag cdist unix]]
diff --git a/docs/web/cdist/os.mdwn b/docs/web/cdist/os.mdwn
new file mode 100644
index 00000000..d53bc1c9
--- /dev/null
+++ b/docs/web/cdist/os.mdwn
@@ -0,0 +1,15 @@
+cdist was tested or is know to run on at least
+
+ * [Archlinux](http://www.archlinux.org/)
+ * [Debian](http://www.debian.org/)
+ * [CentOS](http://www.centos.org/)
+ * [Fedora](http://fedoraproject.org/)
+ * [FreeBSD](http://www.freebsd.org)
+ * [Gentoo](http://www.gentoo.org/)
+ * [Mac OS X](http://www.apple.com/macosx/)
+ * [OpenBSD](http://www.openbsd.org)
+ * [Redhat](http://www.redhat.com/)
+ * [Ubuntu](http://www.ubuntu.com/)
+ * [XenServer](http://www.citrix.com/xenserver/)
+
+[[!tag cdist unix]]
diff --git a/docs/web/cdist/support.mdwn b/docs/web/cdist/support.mdwn
index 47ee1193..7515070d 100644
--- a/docs/web/cdist/support.mdwn
+++ b/docs/web/cdist/support.mdwn
@@ -21,3 +21,5 @@ you can join the
 
 You can request commercial support for cdist from
 [my company](http://firma.schottelius.org/english/).
+
+[[!tag cdist unix]]