diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in
index 52a23d6f0fc..1603c23eecb 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -311,6 +311,7 @@ for example:
                     self.errorAndExit(err)
                 self.putDbProperty(key, value)
             self.info("Preparing %s"%dbpPath, True)
+            self.putDbProperty("region.id", self.options.regionid)
 
         prepareDBDotProperties()
 
@@ -576,6 +577,8 @@ for example:
                           help="Secret key used to encrypt sensitive database values. A string, default is password")
         self.parser.add_option("-i", "--mshost", action="store", type="string", dest="mshostip", default="",
                           help="Cluster management server host IP. A string, by default it will try to detect a local IP")
+        self.parser.add_option("-r", "--regionid", action="store", type="string", dest="regionid", default="1",
+                          help="Region Id for the management server cluster")
 
         (self.options, self.args) = self.parser.parse_args()
         parseCasualCredit()