diff --git a/addons/multi_company/__terp__.py b/addons/multi_company/__terp__.py
index 56c982f3ee8..a62edaa31cb 100644
--- a/addons/multi_company/__terp__.py
+++ b/addons/multi_company/__terp__.py
@@ -1,12 +1,12 @@
 {
-	"name" : "Multi company module",
-	"version" : "1.0",
+	"name" : "Multi company base module",
+	"version" : "0.1",
 	"author" : "Tiny",
-	"depends" : ["project", "account", "hr_timesheet_sheet"],
+	"depends" : ["project", "hr_timesheet_sheet"],
 	"category" : "Generic Modules/Base",
 	"init_xml" : [],
-	"demo_xml" : [],
-	"update_xml" : ["project_view.xml","account_view.xml","hr_view.xml"],
+	"demo_xml" : ["multi_company_demo.xml",],
+	"update_xml" : ["project_view.xml","hr_view.xml"],
 	"active": False,
 	"installable": True
 }
diff --git a/addons/multi_company/account.py b/addons/multi_company/account.py
deleted file mode 100644
index 5814e008bfb..00000000000
--- a/addons/multi_company/account.py
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved.
-#
-# $Id: product_extended.py 5702 2007-02-20 15:33:28Z ced $
-#
-# 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 osv import fields,osv
-
-class account_analytic_account(osv.osv):
-	_inherit = 'account.analytic.account'
-	_columns = {
-		'company_id': fields.many2one('res.company', 'Company'),
-	}
-	_defaults = {
-		'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id
-	}
-account_analytic_account()
-
diff --git a/addons/multi_company/account_view.xml b/addons/multi_company/account_view.xml
deleted file mode 100644
index 8eae3137155..00000000000
--- a/addons/multi_company/account_view.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<terp>
-	<data>
-
-		<record model="ir.ui.view" id="view_analytic_account_multicompany">
-			<field name="name">account.analytic.account.multicompany</field>
-			<field name="model">account.analytic.account</field>
-			<field name="inherit_id" ref="account.view_account_analytic_account_form"/>
-			<field name="arch" type="xml">
-				<field name="user_id" position="after">
-					<field name="company_id" select="1"/>
-				</field>
-			</field>
-		</record>
-
-	</data>
-</terp>
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
new file mode 100644
index 00000000000..7783c160328
--- /dev/null
+++ b/addons/multi_company/multi_company_demo.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<terp>
+	<data fakenoupdate="1">
+		<record model="res.partner" id="second_partner">
+			<field name="name">Tiny2 sprl</field>
+		</record>
+
+		<record model="res.company" id="second_company">
+			<field name="name">Tiny2 sprl</field>
+			<field name="partner_id" ref="base.main_partner"/>
+			<field name="rml_header1">Free Business Solutions</field>
+			<field name="rml_footer1">Web: http://tiny2.be - Tel: (+32).81.81.37.00 - Bank: CPH 126-2013269-07</field>
+			<field name="rml_footer2">IBAN: BE74 1262 0132 6907 - SWIFT: GKCCBEBB - VAT: BE0477.472.701</field>
+			<field name="currency_id" ref="base.EUR"/>
+		</record>
+
+	</data>
+</terp>