diff --git a/cloud.spec b/cloud.spec
index 38750cad530..a1feac0d697 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -591,8 +591,7 @@ fi
 %{_datadir}/%{name}/setup/create-index-fk.sql
 %{_datadir}/%{name}/setup/create-schema.sql
 %{_datadir}/%{name}/setup/server-setup.sql
-%{_datadir}/%{name}/setup/templates.kvm.sql
-%{_datadir}/%{name}/setup/templates.xenserver.sql
+%{_datadir}/%{name}/setup/templates.*.sql
 %{_datadir}/%{name}/setup/deploy-db-dev.sh
 %{_datadir}/%{name}/setup/server-setup.xml
 %{_datadir}/%{name}/setup/data-20to21.sql
diff --git a/debian/cloud-setup.install b/debian/cloud-setup.install
index c82d530d245..7d35dbe9929 100644
--- a/debian/cloud-setup.install
+++ b/debian/cloud-setup.install
@@ -4,8 +4,7 @@
 /usr/share/cloud/setup/create-index-fk.sql
 /usr/share/cloud/setup/create-schema.sql
 /usr/share/cloud/setup/server-setup.sql
-/usr/share/cloud/setup/templates.kvm.sql
-/usr/share/cloud/setup/templates.xenserver.sql
+/usr/share/cloud/setup/templates.*.sql
 /usr/share/cloud/setup/deploy-db-dev.sh
 /usr/share/cloud/setup/server-setup.xml
 /usr/share/cloud/setup/data-20to21.sql
diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
index d1d0154916d..6c34575fcc0 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -43,7 +43,7 @@ except ImportError:
 #---------------------- option parsing and command line checks ------------------------
 
 
-usage = """%prog user:password@mysqlhost:port <kvm|xenserver> [--deploy-as=rootuser:rootpassword] [--auto=/path/to/server-setup.xml]
+usage = """%prog user:password@mysqlhost:port <kvm|xenserver|vmware> [--deploy-as=rootuser:rootpassword] [--auto=/path/to/server-setup.xml]
 
 This command sets up the CloudStack Management Server and CloudStack Usage Server database configuration (connection credentials and host information) based on the first argument.
 
@@ -224,7 +224,7 @@ def setupconfigfile(fn,myipaddr,username,password,host,port):
 (options, args) = parser.parse_args()
 
 if len(args) != 2: e("Wrong number of arguments")
-if args[1] not in ["xenserver","kvm"]: e("You need to specify either xenserver or kvm after the database credentials")
+if args[1] not in ["xenserver","kvm","vmware"]: e("You need to specify either xenserver or kvm or vmware after the database credentials")
 virttech = args[1]
 
 user,password,host,port= get_creds(parser,options,args)
diff --git a/wscript b/wscript
index a9d85e31624..1c212ab0438 100644
--- a/wscript
+++ b/wscript
@@ -759,6 +759,9 @@ def deploydb_xenserver(ctx):
 def deploydb_kvm(ctx):
 	"""re-deploys the database using the MySQL connection information and the KVM templates.sql"""
 	return deploydb(ctx,"kvm")
+def deploydb_vmware(ctx):
+	"""re-deploys the database using the MySQL connection information and the KVM templates.sql"""
+	return deploydb(ctx,"vmware")
 
 def run(args):
 	"""runs the management server"""