diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 38632d01d1a1f2c5651c99b715bc23d54717fb56..70e5bbf10b5a0285064b07aa08a5143fc11453b2 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -2578,6 +2578,7 @@ class installer_base {
 		$content = str_replace('{hostname}', $conf['mysql']['host'], $content);
 		$content = str_replace('{username}', $conf['mysql']['admin_user'], $content);
 		$content = str_replace('{password}', addslashes($conf['mysql']['admin_password']), $content);
+		$content = str_replace('{port}', addslashes($conf['mysql']['port']), $content);
 		wf($install_dir.'/server/lib/mysql_clientdb.conf', $content);
 		chmod($install_dir.'/server/lib/mysql_clientdb.conf', 0600);
 		chown($install_dir.'/server/lib/mysql_clientdb.conf', 'root');
diff --git a/install/tpl/mysql_clientdb.conf.master b/install/tpl/mysql_clientdb.conf.master
index e6eba12615e75403810f554a365c0a19d2c4384d..c205d7142874e279074eecf5502f9b2fd3d86ee2 100644
--- a/install/tpl/mysql_clientdb.conf.master
+++ b/install/tpl/mysql_clientdb.conf.master
@@ -3,5 +3,6 @@
 $clientdb_host			= '{hostname}';
 $clientdb_user			= '{username}';
 $clientdb_password		= '{password}';
+$clientdb_port			= '{port}';
 
 ?>
\ No newline at end of file
diff --git a/server/lib/classes/ispconfig_addon_installer_base.inc.php b/server/lib/classes/ispconfig_addon_installer_base.inc.php
index 25aaece8728ce037ed61c849a3129f3d91aa0ca0..d5b02c65d37a6b786fb7c4e526a561bc7a694043 100644
--- a/server/lib/classes/ispconfig_addon_installer_base.inc.php
+++ b/server/lib/classes/ispconfig_addon_installer_base.inc.php
@@ -119,12 +119,14 @@ class ispconfig_addon_installer_base {
 			}
 		}
 		
+		include '/usr/local/ispconfig/server/lib/mysql_clientdb.conf';
+		
 		$app->log('Adding addon entry to db.', 0, false);
 		// create addon entry if not existing
 		$qry = 'INSERT IGNORE INTO `addons` (`addon_ident`, `addon_version`, `addon_name`, `db_version`) VALUES (?, ?, ?, ?)';
 		$app->db->query($qry, $this->addon_ident, $this->addon_version, $this->addon_name, 0);
 		
-		$mysql_command = 'mysql --default-character-set=' . escapeshellarg($conf['db_charset']) . ' --force -h ' . escapeshellarg($conf['db_host']) . ' -u ' . escapeshellarg($conf['db_user']) . ' -p' . escapeshellarg($conf['db_password']) . ' -P ' . escapeshellarg($conf['db_port']) . ' -D ' . escapeshellarg($conf['db_database']);
+		$mysql_command = 'mysql --default-character-set=' . escapeshellarg($conf['db_charset']) . ' --force -h ' . escapeshellarg($clientdb_host) . ' -u ' . escapeshellarg($clientdb_user) . ' -p' . escapeshellarg($clientdb_password) . ' -P ' . escapeshellarg($clientdb_port) . ' -D ' . escapeshellarg($conf['db_database']);
 		
 		if($incremental === false) {
 			$sql_file = $this->temp_dir . '/install/sql/' . $this->addon_ident . '.sql';