diff --git a/install-dev/upgrade/php/migrate_tabs_multi_shop.php b/install-dev/upgrade/php/migrate_tabs_multi_shop.php
new file mode 100755
index 000000000..2a507b36c
--- /dev/null
+++ b/install-dev/upgrade/php/migrate_tabs_multi_shop.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * Migrate BO tabs for multi-shop new reorganization
+ */
+function migrate_tabs_multi_shop()
+{
+	include_once(_PS_INSTALL_PATH_.'upgrade/php/add_new_tab.php');
+	include_once(_PS_INSTALL_PATH_.'upgrade/php/migrate_tabs_15.php');
+
+	$nbr_shop = Db::getInstance()->getValue('SELECT count(id_shop) FROM '._DB_PREFIX_.'shop');
+	$tab_shop_group_active = false;
+	
+	//check if current configuration has more than one shop
+	if ($nbr_shop > 1)
+	{
+		Db::getInstance()->update('configuration', array('value' => true), 'name = \'PS_MULTISHOP_FEATURE_ACTIVE\'');
+		$tab_shop_group_active = true;		
+	}
+	
+	// ===== remove AdminParentShop from BO menu =====
+	$admin_parent_shop_id = get_tab_id('AdminParentShop');
+	$admin_shop_group_id = get_tab_id('AdminShopGroup');
+	Db::getInstance()->delete('tab', 'id_tab IN ('.(int)$admin_shop_group_id.', '.(int)$admin_parent_shop_id.')');
+	Db::getInstance()->delete('tab_lang', 'id_tab IN ('.(int)$admin_shop_group_id.', '.(int)$admin_parent_shop_id.')');
+	
+	// ===== add AdminShopGroup to parent AdminTools =====
+	$admin_shop_group_id = add_new_tab('AdminShopGroup', 'en:Multi-shop|fr:Multi-boutiques|es:Multi-tienda|de:Multi-shop|it:Multi-shop', get_tab_id('AdminTools'), true);
+	Db::getInstance()->update('tab', array('active' => $tab_shop_group_active), 'id_tab = '.(int)$admin_shop_group_id);
+	
+	// ===== hide AdminShopUrl and AdminShop =====
+	Db::getInstance()->update('tab', array('id_parent' => '-1'), 'id_tab IN ('.get_tab_id('AdminShop').', '.get_tab_id('AdminShopUrl').')');	
+}
+
diff --git a/install-dev/upgrade/sql/1.5.0.12.sql b/install-dev/upgrade/sql/1.5.0.12.sql
index b2c73b5d5..064915f4a 100644
--- a/install-dev/upgrade/sql/1.5.0.12.sql
+++ b/install-dev/upgrade/sql/1.5.0.12.sql
@@ -51,3 +51,4 @@ CREATE TABLE IF NOT EXISTS `PREFIX_risk_lang` (
 UPDATE `PREFIX_tab` SET `class_name`="AdminShopGroup" WHERE class_name="AdminGroupShop";
 
 /* PHP:upgrade_cms_15_rename(); */;
+/* PHP:migrate_tabs_multi_shop(); */;