diff --git a/addons/caldav/caldav_view.xml b/addons/caldav/caldav_view.xml
index 4c1003023ae..d1cb79a0e4a 100644
--- a/addons/caldav/caldav_view.xml
+++ b/addons/caldav/caldav_view.xml
@@ -53,11 +53,11 @@
         <field name="view_id" ref="view_calendar_collection_form"/>
         <field name="act_window_id" ref="action_calendar_collection_form"/>
     </record>
-    
-    <menuitem        
+
+    <menuitem
         id="menu_calendar"
         name="Calendar"
-        parent="base.menu_document_configuration"/>
+        parent="knowledge.menu_document_configuration"/>
 
     <menuitem
         action="action_calendar_collection_form"
diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index e8b8b3969e9..a260a083d74 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -40,7 +40,7 @@
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'process','board'],
+    'depends': ['process','board', 'knowledge'],
     'init_xml': [],
     'update_xml': [
         'security/document_security.xml',
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 5dc1bbcf0f8..e4355987fbb 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -1,11 +1,6 @@
 <openerp>
 <data>
-    <!--<menuitem name="Document Management" icon="terp-stock" id="menu_document"/>
-    <menuitem name="Document Configuration" id="menu_document_configuration" parent="menu_document"/>-->
-
-    <menuitem name="Knowledge" icon="terp-stock" id="base.menu_document" sequence="19" groups="group_document_user"/>
-    <menuitem name="Configuration" id="base.menu_document_configuration" parent="base.menu_document" sequence="50"/>
-    <menuitem name="Document Management" id="menu_document_management_configuration" parent="base.menu_document_configuration" sequence="1"/>
+    <menuitem name="Document Management" id="menu_document_management_configuration" parent="knowledge.menu_document_configuration" sequence="1"/>
 
     <record model="ir.ui.view" id="view_document_storage_form">
         <field name="name">document.storage</field>
@@ -323,7 +318,7 @@
         <field name="name">Document</field>
         <field name="view_type">form</field>
     </record>
-    <menuitem name="Documents" id="menu_document_doc" parent="base.menu_document" sequence="5"/>
+    <menuitem name="Documents" id="menu_document_doc" parent="knowledge.menu_document" sequence="5"/>
     <menuitem
         name="Documents"
         action="action_document_file_form"
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 333cc853542..d7b51ec19dc 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -10,7 +10,7 @@
         <field name="name">Document / Manager</field>
     </record>
 
-    <record id="base.menu_document_configuration" model="ir.ui.menu">
+    <record id="knowledge.menu_document_configuration" model="ir.ui.menu">
         <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
     </record>
 
diff --git a/addons/document_email/document_email.xml b/addons/document_email/document_email.xml
index bfcde49816a..5509d6e8cfb 100644
--- a/addons/document_email/document_email.xml
+++ b/addons/document_email/document_email.xml
@@ -92,12 +92,6 @@
             <field name="context">{}</field>
             <field name="domain">[]</field>
         </record>
-        
-<!--        <menuitem -->
-<!--            parent="base.menu_document"-->
-<!--            id="menu_action_document_email_tree" -->
-<!--            name="Email to Documents"-->
-<!--            action="action_document_email_form"/>-->
-        
+
     </data>
 </openerp>
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index f26f7ea2560..05b1119c4a4 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -32,6 +32,7 @@
     'update_xml': [
         'security/ir.model.access.csv',
         'knowledge_installer.xml',
+        'knowledge_view.xml',
     ],
     'demo_xml': [],
     'installable': True,
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index 8dd7779a290..074c44b0a87 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -24,13 +24,13 @@
     'version': '1.0',
     'category': 'Generic Modules/Others',
     'description': """
-    The base module to manage documents(wiki)
+The base module to manage documents(wiki)
 
-    keep track for the wiki groups, pages, and history
+keep track for the wiki groups, pages, and history
     """,
     'author': 'Tiny & Axelor',
     'website': 'http://openerp.com',
-    'depends': ['base'],
+    'depends': ['knowledge'],
     'init_xml': [],
     'update_xml': [
         'wizard/wiki_wiki_page_open_view.xml',
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 1e117cb6a70..c1baa5cda20 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -2,17 +2,15 @@
 <openerp>
     <data>
        <menuitem name="Knowledge" icon="terp-stock"
-           id="base.menu_document" sequence="19" />
+           id="knowledge.menu_document" sequence="19" />
 
        <menuitem name="Configuration"
-           id="base.menu_document_configuration"
-           parent="base.menu_document" sequence="50" />
+           id="knowledge.menu_document_configuration"
+           parent="knowledge.menu_document" sequence="50" />
 
        <menuitem name="Wiki" id="menu_wiki_configuration"
-           parent="base.menu_document_configuration" sequence="2" />
+           parent="knowledge.menu_document_configuration" sequence="2" />
 
-       <menuitem id="base.menu_document2" name="Collaborative Content"
-           parent="base.menu_document" />
 
 <!--  Wiki Groups Tree view -->
 
@@ -190,7 +188,7 @@
             <field name="search_view_id" ref="view_wiki_filter"/>
         </record>
 
-        <menuitem parent="base.menu_document2"
+        <menuitem parent="knowledge.menu_document2"
             id="menu_action_wiki_wiki" name="Wiki Pages"
             action="action_wiki" />