diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 2cf6764add7d0e4e2c1ed9f41389b5a1835a5f9f..1275223677b578421a62bd44cef5e0a25c27cbcc 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -1072,6 +1072,7 @@ class installer_dist extends installer_base {
 		}
 		
 		$content = rf("tpl/mysql_clientdb.conf.master");
+		$content = str_replace('{hostname}',$conf['mysql']['host'],$content);
 		$content = str_replace('{username}',$conf['mysql']['admin_user'],$content);
 		$content = str_replace('{password}',$conf['mysql']['admin_password'], $content);
 		wf("$install_dir/server/lib/mysql_clientdb.conf",$content);
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 248cf61fa10f59f31125e511c66fd4da46cd1f0e..8aac05f795b34c8271e7b8a7cd7c309577d0a535 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1115,6 +1115,7 @@ class installer_dist extends installer_base {
 		}
 		
 		$content = rf("tpl/mysql_clientdb.conf.master");
+		$content = str_replace('{hostname}',$conf['mysql']['host'],$content);
 		$content = str_replace('{username}',$conf['mysql']['admin_user'],$content);
 		$content = str_replace('{password}',$conf['mysql']['admin_password'], $content);
 		wf("$install_dir/server/lib/mysql_clientdb.conf",$content);
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 2747a89a952e45631af669f07e064f628ab5c9b8..1933db8f960bfde424614715cf13ca0e4830aab0 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -2008,6 +2008,7 @@ class installer_base {
 		}
 
 		$content = rf('tpl/mysql_clientdb.conf.master');
+		$content = str_replace('{hostname}',$conf['mysql']['host'],$content);
 		$content = str_replace('{username}',$conf['mysql']['admin_user'],$content);
 		$content = str_replace('{password}',$conf['mysql']['admin_password'], $content);
 		wf($install_dir.'/server/lib/mysql_clientdb.conf',$content);
diff --git a/install/tpl/mysql_clientdb.conf.master b/install/tpl/mysql_clientdb.conf.master
index 0d3de00f003862a274aa76cb4c98bc062428c62a..e6eba12615e75403810f554a365c0a19d2c4384d 100644
--- a/install/tpl/mysql_clientdb.conf.master
+++ b/install/tpl/mysql_clientdb.conf.master
@@ -1,6 +1,6 @@
 <?php
 
-$clientdb_host			= 'localhost';
+$clientdb_host			= '{hostname}';
 $clientdb_user			= '{username}';
 $clientdb_password		= '{password}';