diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index 0c85ba4a569..529140b2621 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -16,8 +16,9 @@
     ],
     "update_xml" : [
         "wiki_view.xml",
-        "data/wiki_main.xml",
         "data/wiki_quickstart.xml",
+        "data/wiki_main.xml",
+        "data/wiki_faq.xml",
         "wizard/wizard_view.xml",
         "security/ir.model.access.csv"
     ],
diff --git a/addons/wiki/data/wiki_faq.xml b/addons/wiki/data/wiki_faq.xml
index bb12c5f655b..c9395a10563 100644
--- a/addons/wiki/data/wiki_faq.xml
+++ b/addons/wiki/data/wiki_faq.xml
@@ -15,7 +15,46 @@ What's the Document Management System ?
 
             </field>
         </record>
-        <record id="wiki_wiki_quickstart0" model="wiki.wiki">
+        <record id="wiki_wiki_bugs" model="wiki.wiki">
+            <field name="name">Bug Trackers</field>
+            <field name="tags">crm, bugs</field>
+            <field name="group_id" ref="wiki_groups_faq"/>
+            <field name="minor_edit">0</field>
+            <field name="toc">0</field>
+            <field name="review">1</field>
+            <field name="section">2</field>
+            <field name="summary">Initial Page</field>
+            <field name="text_area">
+== Question ==
+
+What's the Bug Tracker ?
+
+== Answer ==
+
+The Open ERP bugtracker allows to manage bugs. Stop using a separated bugtracker. Using Open ERP
+will allow you to track time on bugs, to integrate it with the mail gateway, to
+link bugs with timesheets, to invoice bugs, etc.
+
+Key Points:
+
+* Flexible &amp; easy to use
+* eMail gateway
+* Automated rules
+
+Integration Benefits:
+
+* Linked to timesheets &amp; projects
+* Generate sales and invoices
+* Integrated in your dashboard
+
+== External Links ==
+
+* [http://openerp.com The Open ERP Website]
+* [http://openerp.com The DMS Documentation]
+
+            </field>
+        </record>
+        <record id="wiki_wiki_dms" model="wiki.wiki">
             <field name="name">Document Management System</field>
             <field name="tags">dms, document</field>
             <field name="group_id" ref="wiki_groups_faq"/>
@@ -51,7 +90,9 @@ Integration Benefits:
 
 == External Links ==
 
-* http://openerp.com
+* [http://openerp.com The Open ERP Website]
+* [http://openerp.com The DMS Documentation]
+
             </field>
         </record>
     </data>
diff --git a/addons/wiki/data/wiki_main.xml b/addons/wiki/data/wiki_main.xml
new file mode 100644
index 00000000000..54359fd07de
--- /dev/null
+++ b/addons/wiki/data/wiki_main.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="wiki_wiki_main" model="wiki.wiki">
+            <field name="name">The Open ERP wiki</field>
+            <field name="tags">help, quick start, wiki, formatting</field>
+            <field name="minor_edit">0</field>
+            <field name="section">1</field>
+            <field name="toc">0</field>
+            <field name="summary">Initial Page</field>
+            <field  name="text_area">=The Open ERP wiki=
+The Open ERP wiki allows you to manage your enterprise's contents using wiki
+restructured texts. This module provides a collaborative way to manage internal
+FAQs, quality manuals, technical references, etc.
+
+==Keypoints==
+* Same formating style than MediaWiki,
+* Any number of wiki group for different purposes,
+* Detailed history on all pages,
+* Integrated with the document management system.
+
+==Why you should use the Open ERP integrated wiki than a separate wiki system ?==
+* Allows links to any document of the system,
+* Uses the access controls of Open ERP for uniq access rights management,
+* Use it to describe projects, tasks, products,
+* Integrated with customer portal to provide restricted external accesses,
+* Linked to users processes for quality manuals.
+
+==To get more information==
+* [[Basic Wiki Editing]]
+* [[Wiki Documentation]]
+* [[The Open ERP website]]
+
+
+</field>
+            <field name="group_id" ref="wiki_groups_wikiformatting0"/>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 48a7f31ebce..f5329405b8c 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -79,7 +79,8 @@
             <field name="arch" type="xml">
                 <tree string="Wiki">
                     <field name="name"/>
-                    <field name="section"/>
+                    <field name="section" invisible="not context.get('section',False)"/>
+                    <field name="group_id" invisible="context.get('group_id',False)"/>
                     <field name="review"/>
                     <field name="write_uid"/>
                     <field name="write_date"/>
@@ -98,12 +99,11 @@
                         <field name="group_id" select="1" on_change="onchange_group_id(group_id, text_area)"/>
                         <field name="section" select="2" invisible="not context.get('section',False)"/>
                         <field name="write_date" readonly="1" select="2"/>
-                        <field name="write_uid" readonly="1" select="2"/>
                         <field name="review" select="1"/>
                         <field name="minor_edit" select="2" groups="base.group_extended"/>
                         <field name="toc"/>
-                        <field name="summary" colspan="4" select="2" groups="base.group_extended"/>
                         <field name="tags" select="2" groups="base.group_extended"/>
+                        <field name="summary" colspan="4" select="2" groups="base.group_extended"/>
                     </group>
                     <field name="text_area" nolabel="1" colspan="4" select="1" widget="text_wiki"/>
                 </form>
@@ -172,6 +172,7 @@
 
         <act_window
             domain="[('group_id', 'child_of', active_ids)]"
+            context="{'group_id': active_ids}"
             id="act_wiki_group_open"
             name="Wiki Pages"
             res_model="wiki.wiki"