diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index a046cc01c44..92914f8f7a3 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -37,26 +37,4 @@ class base_config_settings(osv.osv_memory):
                 This installs the module share."""),
     }
 
-
-
-class knowledge_config_settings(osv.osv_memory):
-    _name = 'knowledge.config.settings'
-    _inherit = 'res.config.settings'
-    _columns = {
-        'module_wiki_faq': fields.boolean('Use a Wiki for Frequently Asked Questions',
-            help="""This installs the module wiki_faq."""), 
-        'module_wiki_quality_manual': fields.boolean('Track Quality with a Wiki',
-            help="""This installs the module wiki_quality_manual."""),
-        'module_document': fields.boolean('Document Management',
-            help="""This is a complete document management system, with: user authentication,
-                full document search (but pptx and docx are not supported), and a document dashboard.
-                This installs the module document."""),
-        'module_document_ftp': fields.boolean('Share repositories (FTP)',
-            help="""Access your documents in OpenERP through an FTP interface.
-                This installs the module document_ftp."""),
-        'module_document_webdav': fields.boolean('Share Repositories (WebDAV)',
-            help="""Access your documents in OpenERP through WebDAV.
-                This installs the module document_webdav."""),
-    }
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 4c35930f81b..f9c851a3002 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -37,41 +37,5 @@
         <menuitem id="menu_general_configuration" name="Settings" parent="base.menu_config"
             sequence="100" action="action_general_configuration"/>
 
-        <record id="view_knowledge_configuration" model="ir.ui.view">
-            <field name="name">Configure Knowledge</field>
-            <field name="model">knowledge.config.settings</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Configure Knowledge" layout="manual">
-                    <div class="oe_form_topbar">
-                        <button string="Apply" type="object" name="execute"/>
-                        <button string="Cancel" special="cancel"/>
-                    </div>
-                    <sheet layout="auto">
-                        <separator string="Wiki" colspan="4"/>
-                        <field name="module_wiki_faq"/>
-                        <newline/>
-                        <field name="module_wiki_quality_manual"/>
-
-                        <separator string="Documents" colspan="4"/>
-                        <field name="module_document"/>
-                        <newline/>
-                        <field name="module_document_ftp"/>
-                        <newline/>
-                        <field name="module_document_webdav"/>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="action_knowledge_configuration" model="ir.actions.act_window">
-            <field name="name">Configure Knowledge</field>
-            <field name="res_model">knowledge.config.settings</field>
-            <field name="view_mode">form</field>
-            <field name="target">inline</field>
-        </record>
-        <menuitem id="menu_knowledge_configuration" name="Knowledge" parent="base.menu_config"
-            sequence="19" action="action_knowledge_configuration"/>
-
     </data>
 </openerp>
diff --git a/addons/knowledge/__init__.py b/addons/knowledge/__init__.py
index 9a3d6d2fbb6..53c45089ddc 100644
--- a/addons/knowledge/__init__.py
+++ b/addons/knowledge/__init__.py
@@ -19,5 +19,6 @@
 #
 ##############################################################################
 
+import res_config
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index aa45834bb38..edefd6655ea 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -40,6 +40,7 @@ document and Wiki based Hidden.
         'security/knowledge_security.xml',
         'security/ir.model.access.csv',
         'knowledge_view.xml',
+        'res_config_view.xml',
     ],
     'demo_xml': ['knowledge_demo.xml'],
     'installable': True,
diff --git a/addons/knowledge/res_config.py b/addons/knowledge/res_config.py
new file mode 100644
index 00000000000..a43d4377bcd
--- /dev/null
+++ b/addons/knowledge/res_config.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Business Applications
+#    Copyright (C) 2004-2012 OpenERP S.A. (<http://openerp.com>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import osv, fields
+
+class knowledge_config_settings(osv.osv_memory):
+    _name = 'knowledge.config.settings'
+    _inherit = 'res.config.settings'
+    _columns = {
+        'module_wiki_faq': fields.boolean('Use a Wiki for Frequently Asked Questions',
+            help="""This installs the module wiki_faq."""), 
+        'module_wiki_quality_manual': fields.boolean('Track Quality with a Wiki',
+            help="""This installs the module wiki_quality_manual."""),
+        'module_document': fields.boolean('Document Management',
+            help="""This is a complete document management system, with: user authentication,
+                full document search (but pptx and docx are not supported), and a document dashboard.
+                This installs the module document."""),
+        'module_document_ftp': fields.boolean('Share repositories (FTP)',
+            help="""Access your documents in OpenERP through an FTP interface.
+                This installs the module document_ftp."""),
+        'module_document_webdav': fields.boolean('Share Repositories (WebDAV)',
+            help="""Access your documents in OpenERP through WebDAV.
+                This installs the module document_webdav."""),
+    }
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
new file mode 100644
index 00000000000..6816a9da3a1
--- /dev/null
+++ b/addons/knowledge/res_config_view.xml
@@ -0,0 +1,41 @@
+<openerp>
+    <data>
+
+        <record id="view_knowledge_configuration" model="ir.ui.view">
+            <field name="name">Configure Knowledge</field>
+            <field name="model">knowledge.config.settings</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Configure Knowledge" layout="manual">
+                    <div class="oe_form_topbar">
+                        <button string="Apply" type="object" name="execute"/>
+                        <button string="Cancel" special="cancel"/>
+                    </div>
+                    <sheet layout="auto">
+                        <separator string="Wiki" colspan="4"/>
+                        <field name="module_wiki_faq"/>
+                        <newline/>
+                        <field name="module_wiki_quality_manual"/>
+
+                        <separator string="Documents" colspan="4"/>
+                        <field name="module_document"/>
+                        <newline/>
+                        <field name="module_document_ftp"/>
+                        <newline/>
+                        <field name="module_document_webdav"/>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_knowledge_configuration" model="ir.actions.act_window">
+            <field name="name">Configure Knowledge</field>
+            <field name="res_model">knowledge.config.settings</field>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+        </record>
+        <menuitem id="menu_knowledge_configuration" name="Knowledge" parent="base.menu_config"
+            sequence="19" action="action_knowledge_configuration"/>
+
+    </data>
+</openerp>