diff --git a/docs/releases/2.2.rst b/docs/releases/2.2.rst
index c08fed9095..d468a914a6 100644
--- a/docs/releases/2.2.rst
+++ b/docs/releases/2.2.rst
@@ -61,6 +61,13 @@ resolved to '/api/documents/<pk>/pages/<page_pk>/pages'.
 
 Other changes
 -------------
+- Cabinets app is now integrated as a core app.
+- Now that the Cabinets app is included, the Folders app has been disabled 
+  by default. To enable the Folders apps add the following line to your 
+  settings/local.py file::
+
+    INSTALLED_APPS += ('folders',)
+
 - The user's full name or username is no longer displayed in the main menu.
   Instead the work "Profile" is displayed. The users's full name or username
   will be displayed when the "Profile" icon is clicked. This avoid menu
@@ -71,7 +78,6 @@ Other changes
   more explicit 'has_test'.
 - The packaging manifest now includes test files. Test can now be executed
   in production.
-- The Cabinets app integration as core app.
 - Add "Check now" button to interval sources.
 - Remove the installation app.
 - Add support for page search.
diff --git a/mayan/settings/base.py b/mayan/settings/base.py
index ec03a3635e..485f19b51d 100644
--- a/mayan/settings/base.py
+++ b/mayan/settings/base.py
@@ -87,7 +87,9 @@ INSTALLED_APPS = (
     'document_states',
     'documents',
     'events',
-    'folders',
+    # Disable the folders app by default
+    # Will be removed in the next version
+    # 'folders',
     'linking',
     'mailer',
     'metadata',