diff --git a/addons/report_webkit/__init__.py b/addons/report_webkit/__init__.py
index e09f929ad56..dd44517e787 100644
--- a/addons/report_webkit/__init__.py
+++ b/addons/report_webkit/__init__.py
@@ -35,5 +35,6 @@ import report_helper
 import webkit_report
 import ir_report
 import wizard
+import convert
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/report_webkit/convert.py b/addons/report_webkit/convert.py
new file mode 100644
index 00000000000..b4d42325bb6
--- /dev/null
+++ b/addons/report_webkit/convert.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com)
+# All Right Reserved
+#
+# Author : Nicolas Bessi (Camptocamp)
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from openerp.tools import convert
+
+original_xml_import = convert.xml_import
+
+class WebkitXMLImport(original_xml_import):
+
+    # Override of xml import in order to add webkit_header tag in report tag.
+    # As discussed with the R&D Team,  the current XML processing API does
+    # not offer enough flexibity to do it in a cleaner way.
+    # The solution is not meant to be long term solution, but at least
+    # allows chaining of several overrides of the _tag_report method,
+    # and does not require a copy/paste of the original code.
+    def _tag_report(self, cr, rec, data_node=None):
+        report_id = super(WebkitXMLImport, self)._tag_report(cr, rec, data_node)
+        if rec.get('report_type') == 'webkit':
+            header = rec.get('webkit_header')
+            if header:
+                if header in ('False', '0', 'None'):
+                    webkit_header_id = False
+                else:
+                    webkit_header_id = self.id_get(cr, header)
+                self.pool.get('ir.actions.report.xml').write(cr, self.uid,
+                    report_id, {'webkit_header': webkit_header_id})
+        return report_id
+
+convert.xml_import = WebkitXMLImport
diff --git a/addons/report_webkit_sample/report_webkit_html_view.xml b/addons/report_webkit_sample/report_webkit_html_view.xml
index b4839496de2..4616c01e908 100644
--- a/addons/report_webkit_sample/report_webkit_html_view.xml
+++ b/addons/report_webkit_sample/report_webkit_html_view.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <report auto="False" id="report_webkit_html" model="account.invoice" name="webkitaccount.invoice"  file="report_webkit_sample/report/report_webkit_html.mako" string="WebKit invoice" report_type="webkit" />
+        <report auto="False"
+                id="report_webkit_html"
+                model="account.invoice"
+                name="webkitaccount.invoice"
+                file="report_webkit_sample/report/report_webkit_html.mako"
+                string="WebKit invoice"
+                report_type="webkit"
+                webkit_header="report_webkit.ir_header_webkit_basesample0"/>
     </data>
 </openerp>