diff --git a/api.log b/api.log
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/cloud.spec b/cloud.spec
index 34b1d4d9411..f8d28560e7b 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -580,6 +580,7 @@ fi
 %{_datadir}/%{name}/setup/schema-level.sql
 %{_datadir}/%{name}/setup/data-214to215.sql
 %{_datadir}/%{name}/setup/schema-216to217.sql
+%{_datadir}/%{name}/setup/schema-217to218.sql
 %doc README
 %doc HACKING
 %doc debian/copyright
@@ -591,6 +592,7 @@ fi
 %{_sysconfdir}/%{name}/management/commands.properties
 %{_sysconfdir}/%{name}/management/components.xml
 %{_sysconfdir}/%{name}/management/context.xml
+%{_sysconfdir}/%{name}/management/simulator.properties
 %config(noreplace) %attr(640,root,%{name}) %{_sysconfdir}/%{name}/management/db.properties
 %{_sysconfdir}/%{name}/management/environment.properties
 %{_sysconfdir}/%{name}/management/ehcache.xml
diff --git a/debian/cloud-setup.install b/debian/cloud-setup.install
index cf55edb6c42..ff4c2294211 100644
--- a/debian/cloud-setup.install
+++ b/debian/cloud-setup.install
@@ -17,3 +17,4 @@
 /usr/share/cloud/setup/schema-level.sql
 /usr/share/cloud/setup/data-214to215.sql
 /usr/share/cloud/setup/schema-216to217.sql
+/usr/share/cloud/setup/schema-217to218.sql
diff --git a/setup/db/schema-217to218.sql b/setup/db/schema-217to218.sql
new file mode 100644
index 00000000000..06ee15f7aa4
--- /dev/null
+++ b/setup/db/schema-217to218.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `cloud`.`account_vlan_map` modify `account_id` bigint unsigned default null;
+
+
+ALTER TABLE `cloud`.`account_vlan_map` ADD COLUMN `domain_id` bigint unsigned COMMENT 'domain id. foreign key to domain table';
+ALTER TABLE `cloud`.`account_vlan_map` ADD CONSTRAINT `fk_account_vlan_map__domain_id` FOREIGN KEY `fk_account_vlan_map__domain_id` (`domain_id`) REFERENCES `domain` (`id`) ON DELETE CASCADE;
+ALTER TABLE `cloud`.`account_vlan_map` ADD INDEX `i_account_vlan_map__domain_id`(`domain_id`);