diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index 3093134e47a..6d1c4600817 100644
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -39,7 +39,7 @@
         'wizard/wizard_view.xml',
         'security/ir.model.access.csv'
     ],
-    'demo_xml': ['data/wiki_faq.xml'],
+    'demo_xml': [],
     'installable': True,
     'active': False,
     'certificate': '0086363630317',
diff --git a/addons/wiki_faq/__init__.py b/addons/wiki_faq/__init__.py
new file mode 100644
index 00000000000..938f045b9fd
--- /dev/null
+++ b/addons/wiki_faq/__init__.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki_faq/__terp__.py b/addons/wiki_faq/__terp__.py
new file mode 100644
index 00000000000..3d06108cb5b
--- /dev/null
+++ b/addons/wiki_faq/__terp__.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
+#
+#    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/>.
+#
+##############################################################################
+
+{
+    'name': 'Document Management - Wiki - FAQ',
+    'version': '1.0',
+    'category': 'Generic Modules/Others',
+    'description': """FAQ Template
+    """,
+    'author': 'Tiny',
+    'website': 'http://openerp.com',
+    'depends': ['wiki'],
+    'init_xml': [],
+    'update_xml': ['wiki_faq.xml'],
+    'demo_xml': [],
+    'installable': True,
+    'active': False,
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/wiki/data/wiki_faq.xml b/addons/wiki_faq/wiki_faq.xml
similarity index 96%
rename from addons/wiki/data/wiki_faq.xml
rename to addons/wiki_faq/wiki_faq.xml
index eabd591d232..84dfd3a486d 100644
--- a/addons/wiki/data/wiki_faq.xml
+++ b/addons/wiki_faq/wiki_faq.xml
@@ -6,8 +6,6 @@
             <field eval="2" name="section"/>
             <field name="template">== Question ==
 
-...
-
 == Answer ==
 
 == External Links ==
@@ -23,8 +21,7 @@
             <field name="review">1</field>
             <field name="section">2</field>
             <field name="summary">Initial Page</field>
-            <field name="text_area">
-== Question ==
+            <field name="text_area">== Question ==
 
 What's the Bug Tracker ?
 
@@ -61,8 +58,7 @@ Integration Benefits:
             <field name="toc">1</field>
             <field name="section">1</field>
             <field name="summary">Initial Page</field>
-            <field name="text_area">
-== Question ==
+            <field name="text_area">== Question ==
 
 What's the Document Management System ?