diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index d136d851ff2..5edd341e458 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -24,14 +24,14 @@
     'version': '2.0',
     'category': 'Marketing',
     'description': """
-This module is used for surveying.
-==================================
+Create beautiful web surveys and visualize answers
+==================================================
 
 It depends on the answers or reviews of some questions by different users. A
 survey may have multiple pages. Each page may contain multiple questions and
 each question may have multiple answers. Different users may give different
 answers of question and according to that survey is done. Partners are also
-sent mails with user name and password for the invitation of the survey.
+sent mails with personal token for the invitation of the survey.
     """,
     'summary': 'Create surveys, collect answers and print statistics',
     'author': 'OpenERP SA',
@@ -43,10 +43,12 @@ sent mails with user name and password for the invitation of the survey.
         'views/survey_views.xml',
         'views/survey_templates.xml',
         'wizard/survey_email_compose_message.xml',
-        'data/survey_cron.xml',
-        'data/survey_data.xml'
+        'data/survey_cron.xml'
     ],
-    #'demo': ['survey_demo.xml'],
+    'demo': ['data/survey_demo_user.xml',
+             'data/survey_demo_recruitment.xml',
+             'data/survey_demo_feedback.xml',
+             'data/survey_demo_appraisal.xml'],
     #'test': [
     #    'test/survey_test.py',
     #],
diff --git a/addons/survey/data/survey_data.xml b/addons/survey/data/survey_data.xml
deleted file mode 100644
index 89b4d423d87..00000000000
--- a/addons/survey/data/survey_data.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-        <!-- Grant survey permissions to demo user -->
-        <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_survey_manager'))]" name="groups_id"/>
-        </record>
-        <!-- Appraisal Form -->
-        <record model="survey.survey" id="appraisal_form">
-            <field name="title">Self Appraisal Form</field>
-            <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')" />
-<!--             <field name="state">open</field>
- -->            <field name="visible_to_user" eval="False"/>
-            <field name="users_can_go_back" eval="True" />
-            <field name="color" eval="4" />
-            <field name="description"> </field>
-            <field name="thank_you_message"> </field>
-        </record>
-        <record model="survey.page" id="appraisal_1">
-            <field name="title">Page1</field>
-            <field name="survey_id" ref="appraisal_form" />
-            <field name="sequence">1</field>
-            <field name="description"></field>
-        </record>
-        <!-- Recruitment Form -->
-        <record model="survey.survey" id="recruitment_form">
-            <field name="title">Recruitment Form</field>
-            <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')" />
-<!--             <field name="state">open</field> -->
-            <field name="visible_to_user" eval="False"/>
-            <field name="users_can_go_back" eval="False" />
-            <field name="color" eval="5" />
-            <field name="description"> </field>
-            <field name="thank_you_message"> </field>
-        </record>
-        <!-- User Feedback Form -->
-        <record model="survey.survey" id="feedback_form">
-            <field name="title">User Feedback Form</field>
-            <field name="date_open" eval="time.strftime('%Y-%m-%d %H:%M:%S')" />
-<!--             <field name="state">open</field> -->
-            <field name="visible_to_user" eval="True"/>
-            <field name="users_can_go_back" eval="True" />
-            <field name="color" eval="6" />
-            <field name="description"> </field>
-            <field name="thank_you_message"></field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
diff --git a/addons/survey/data/survey_demo_appraisal.xml b/addons/survey/data/survey_demo_appraisal.xml
new file mode 100644
index 00000000000..c29efa79123
--- /dev/null
+++ b/addons/survey/data/survey_demo_appraisal.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Appraisal form -->
+        <record model="survey.survey" id="appraisal_form">
+            <field name="title">Self Appraisal Form</field>
+            <field name="state">draft</field>
+            <field name="visible_to_user" eval="False"/>
+            <field name="users_can_go_back" eval="True" />
+            <field name="color" eval="4" />
+            <field name="description"> </field>
+            <field name="thank_you_message"> </field>
+        </record>
+        <record model="survey.page" id="appraisal_1">
+            <field name="title">Page1</field>
+            <field name="survey_id" ref="appraisal_form" />
+            <field name="sequence">1</field>
+            <field name="description"></field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/survey/data/survey_demo_feedback.xml b/addons/survey/data/survey_demo_feedback.xml
new file mode 100644
index 00000000000..9cbff17c3c7
--- /dev/null
+++ b/addons/survey/data/survey_demo_feedback.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- User Feedback Form -->
+        <record model="survey.survey" id="feedback_form">
+            <field name="title">User Feedback Form</field>
+            <field name="state">draft</field>
+            <field name="visible_to_user" eval="True"/>
+            <field name="users_can_go_back" eval="True" />
+            <field name="color" eval="6" />
+            <field name="description"> </field>
+            <field name="thank_you_message"></field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/survey/data/survey_demo_recruitment.xml b/addons/survey/data/survey_demo_recruitment.xml
new file mode 100644
index 00000000000..f607978ce15
--- /dev/null
+++ b/addons/survey/data/survey_demo_recruitment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Recruitment Form -->
+        <record model="survey.survey" id="recruitment_form">
+            <field name="title">Recruitment Form</field>
+            <field name="state">draft</field>
+            <field name="visible_to_user" eval="False"/>
+            <field name="users_can_go_back" eval="False" />
+            <field name="color" eval="5" />
+            <field name="description"> </field>
+            <field name="thank_you_message"> </field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/survey/data/survey_demo_user.xml b/addons/survey/data/survey_demo_user.xml
new file mode 100644
index 00000000000..26a60c8b2c5
--- /dev/null
+++ b/addons/survey/data/survey_demo_user.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Grant survey permissions to demo user -->
+        <record id="base.user_demo" model="res.users">
+            <field eval="[(4, ref('base.group_survey_manager'))]" name="groups_id"/>
+        </record>
+    </data>
+</openerp>