diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 3d749c2ef2f..5d7d05615cb 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -87,14 +87,21 @@ class Wiki(osv.osv):
         }
 
     def write(self, cr, uid, ids, vals, context=None):
+        result = super(Wiki,self).write(cr, uid, ids, vals, context)
+        history = self.pool.get('wiki.wiki.history')
+        
         if vals.get('text_area'):
-            vals['history_id']=[(0,0,{
-                'minor_edit':vals.get('minor_edit', False),
-                'text_area':vals['text_area'],
-                'modify_by':uid,
-                'summary':vals.get('summary','')
-            })]
-        return super(Wiki,self).write(cr, uid, ids, vals, context)
+            for id in ids:
+                res = {
+                    'minor_edit':vals.get('minor_edit', True),
+                    'text_area':vals.get('text_area',''),
+                    'write_uid':uid,
+                    'wiki_id' : id,
+                    'summary':vals.get('summary','')
+                }
+                history.create(cr, uid, res)
+        return result
+
 Wiki()
 
 class History(osv.osv):
@@ -103,17 +110,15 @@ class History(osv.osv):
     _rec_name="date_time"
     _order = 'id DESC'
     _columns={
-      'date_time':fields.datetime("Date",select=True),
+      'create_date':fields.datetime("Date",select=True),
       'text_area':fields.text("Text area",select=True),
       'minor_edit':fields.boolean('This is a major edit ?',select=True),
       'summary':fields.char('Summary',size=256, select=True),
-      'modify_by':fields.many2one('res.users',"Modify By", select=True),
-      'hist_write_date':fields.datetime("Last modified", select=True),
-      'history_wiki_id':fields.many2one('wiki.wiki','Wiki Id', select=True)
+      'write_uid':fields.many2one('res.users',"Modify By", select=True),
+      'wiki_id':fields.many2one('wiki.wiki','Wiki Id', select=True)
     }
     _defaults = {
-        'hist_write_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'modify_by': lambda obj,cr,uid,context: uid,
+        'write_uid': lambda obj,cr,uid,context: uid,
     }
     def getDiff(self, cr, uid, v1, v2, context={}):
         import difflib
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 0aed52c4856..4fca7a8f7df 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -126,8 +126,8 @@
             <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree srting="Wiki History">
-                    <field name="date_time"/>
-                    <field name="modify_by"/>
+                    <field name="create_date"/>
+                    <field name="write_uid"/>
                     <field name="minor_edit"/>
                     <field name="summary"/>
                 </tree>
@@ -140,12 +140,11 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form srting="Wiki History">
-                    <field name="history_wiki_id" select="1" colspan="4"/>
+                    <field name="wiki_id" select="1" colspan="4"/>
                     <field name="summary" select="1" colspan="4"/>
                     <field name="text_area" select="1" colspan="4" widget="text_wiki"/>
-                    <field name="date_time" select="1"/>
+                    <field name="create_date" select="1"/>
                     <field name="minor_edit" select="1"/>
-                    <field name="history_wiki_id"/>
                 </form>
             </field>
         </record>
@@ -161,7 +160,7 @@
             id="menu_action_history"
             action="action_history"/>
 
-        <act_window domain="[('history_wiki_id', '=', active_id)]"
+        <act_window domain="[('wiki_id', '=', active_id)]"
             id="act_wiki_wiki_history"
             name="History"
             res_model="wiki.wiki.history"
diff --git a/addons/wiki/wizard/create_menu.py b/addons/wiki/wizard/create_menu.py
index 9d688b34f1c..2b6c4df8e64 100644
--- a/addons/wiki/wizard/create_menu.py
+++ b/addons/wiki/wizard/create_menu.py
@@ -47,7 +47,7 @@ def report_menu_create(self, cr, uid, data, context):
         'view_type':'form',
         'view_mode':"tree,form",
         'context': "{'group_id':%d}" % (group.id,),
-        'domain': "[('group_id','child_of',%d)]" % (group.id,),
+        'domain': "[('group_id','child_of',[%d])]" % (group.id,),
         'res_model': 'wiki.wiki'
     })
     pool.get('ir.ui.menu').create(cr, uid, {