diff --git a/buildout.cfg b/buildout.cfg
index 618d54061d..826747071b 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -28,6 +28,8 @@ auto-checkout =
     Products.BTreeFolder2
     Products.ZCatalog
     RestrictedPython
+    Products.MailHost
+    Products.PythonScripts
 
 [testenv]
 PYTHONHASHSEED = random
diff --git a/docs/WHATSNEW.rst b/docs/WHATSNEW.rst
index c8fe3c115e..f8a56f2a3b 100644
--- a/docs/WHATSNEW.rst
+++ b/docs/WHATSNEW.rst
@@ -143,3 +143,11 @@ Zope 4 depends on a new DateTime release. The new release has been optimized
 for better memory use. Applications using a lot of DateTime values like the
 Plone CMS have seen total memory usage to decrease by 10% to 20% for medium
 to large deployments.
+
+
+ZMI overhaul
+------------
+
+The ZMI (Zope Management Interface) is now styled with Twitter Bootstrap.
+See :ref:`ZMI-label` for details how to adapt Zope add-on packages to the new
+styling.
diff --git a/docs/ZMI.rst b/docs/ZMI.rst
new file mode 100644
index 0000000000..8f37c2fbbc
--- /dev/null
+++ b/docs/ZMI.rst
@@ -0,0 +1,30 @@
+.. _ZMI-label:
+
+ZMI
+===
+
+ZMI is an abbreviation for `Zope Management Interface`. This is the user
+interface rendered when accessing Zope`s management screens using a web
+browser.
+
+Bootstrap ZMI
+-------------
+
+Since Zope 4.0b4 the ZMI is styled using Twitter bootstrap. The previously used
+GIF icons were replaced by font glyphs which are stored in the package
+`zmi.icons`_
+
+Inside that package is a table of the `available icons`_ including the names
+which are required to use them.
+
+Update packages
++++++++++++++++
+
+If you have a Product or package which contains types, which can be added via
+the ZMI, the default icon will be shown.
+
+To use one of the new icons add an attribute named `zmi_icon` to the class. The
+value should be one of the names listed on `available icons`_.
+
+.. _`zmi.icons` : https://github.com/zopefoundation/zmi.icons
+.. _`available icons` : http://htmlpreview.github.io/?https://github.com/zopefoundation/zmi.icons/blob/master/zmi/icons/resources/demo.html
diff --git a/docs/index.rst b/docs/index.rst
index b541ec3c9a..9d1ca2af5e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -11,6 +11,7 @@ Contents:
    INSTALL-virtualenv
    operation
    USERS
+   ZMI
    SECURITY
    maintenance
    changes
diff --git a/sources.cfg b/sources.cfg
index ec30057895..0f1ab1d40c 100644
--- a/sources.cfg
+++ b/sources.cfg
@@ -25,6 +25,7 @@ five.localsitemanager = git ${remotes:github}/five.localsitemanager pushurl=${re
 Missing = git ${remotes:github}/Missing pushurl=${remotes:github_push}/Missing
 Products.BTreeFolder2 = git ${remotes:github}/Products.BTreeFolder2 pushurl=${remotes:github_push}/Products.BTreeFolder2 branch=zmi-bootstrap
 Products.MailHost = git ${remotes:github}/Products.MailHost pushurl=${remotes:github_push}/Products.MailHost
+Products.PythonScripts = git ${remotes:github}/Products.PythonScripts pushurl=${remotes:github_push}/Products.PythonScripts
 Products.ZCatalog = git ${remotes:github}/Products.ZCatalog pushurl=${remotes:github_push}/Products.ZCatalog branch=zmi-bootstrap
 Products.ZCTextIndex = git ${remotes:github}/Products.ZCTextIndex pushurl=${remotes:github_push}/Products.ZCTextIndex
 Record = git ${remotes:github}/Record pushurl=${remotes:github_push}/Record