diff --git a/modules/mysql/edit_server.php b/modules/mysql/edit_server.php
index 3001b2a5..fdccccb1 100644
--- a/modules/mysql/edit_server.php
+++ b/modules/mysql/edit_server.php
@@ -54,7 +54,7 @@ function exec_ogp_module() {
 
 	$modDb = new MySQLModuleDatabase();
 	require("includes/config.inc.php");
-	$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+	$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 	
     global $view, $db;
 
@@ -228,7 +228,7 @@ function exec_ogp_module() {
 							break;
 					}
 					mysqli_close($link);
-					$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+					$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 				}
 			}
 			else
@@ -246,7 +246,7 @@ function exec_ogp_module() {
 							break;
 					}
 					mysql_close($link);
-					$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+					$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 				}
 			}
 		}
@@ -316,7 +316,7 @@ function exec_ogp_module() {
 									break;
 							}
 							mysqli_close($link);
-							$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+							$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 						}
 					}
 					else
@@ -335,7 +335,7 @@ function exec_ogp_module() {
 									break;
 							}
 							mysql_close($link);
-							$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+							$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 						}
 					}
 				}
@@ -383,7 +383,7 @@ function exec_ogp_module() {
 									break;
 							}
 							mysqli_close($link);
-							$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+							$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 						}
 					}
 					else
@@ -406,7 +406,7 @@ function exec_ogp_module() {
 									break;
 							}
 							mysql_close($link);
-							$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+							$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 						}
 					}
 				}
diff --git a/modules/mysql/get_dump.php b/modules/mysql/get_dump.php
index 9a1b7f3d..076c867d 100644
--- a/modules/mysql/get_dump.php
+++ b/modules/mysql/get_dump.php
@@ -9,7 +9,7 @@ function exec_ogp_module() {
 
 	$modDb = new MySQLModuleDatabase();
 	require("includes/config.inc.php");
-	$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+	$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 	
 	global $db;
 	
diff --git a/modules/mysql/mysqli_database.php b/modules/mysql/mysqli_database.php
index 34290755..2618eba4 100644
--- a/modules/mysql/mysqli_database.php
+++ b/modules/mysql/mysqli_database.php
@@ -41,11 +41,12 @@ class MySQLModuleDatabase extends OGPDatabaseMySQL
 
         $this->table_prefix = $table_prefix;
 
-        /// \todo We might want to do other checks here as well?
         if ( $db_host === NULL )
             return -1;
 
-        $this->link = mysqli_connect($db_host, $db_user, $db_pass);
+        // Use the port from config.inc.php if provided (supports non-standard ports e.g. 3307)
+        $port = !empty($db_port) ? (int)$db_port : 3306;
+        $this->link = mysqli_connect($db_host, $db_user, $db_pass, $db_name, $port);
 
         if ( $this->link === FALSE )
             return -11;
diff --git a/modules/mysql/servers.php b/modules/mysql/servers.php
index 3e97ff76..196caa81 100644
--- a/modules/mysql/servers.php
+++ b/modules/mysql/servers.php
@@ -49,7 +49,7 @@ function exec_ogp_module() {
 
 	$modDb = new MySQLModuleDatabase();
 	require("includes/config.inc.php");
-	$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+	$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 	
 	global $view,$db;
 	
diff --git a/modules/mysql/user_db.php b/modules/mysql/user_db.php
index b7a084df..fe230dbc 100644
--- a/modules/mysql/user_db.php
+++ b/modules/mysql/user_db.php
@@ -41,7 +41,7 @@ function exec_ogp_module() {
 
 	$modDb = new MySQLModuleDatabase();
 	require("includes/config.inc.php");
-	$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+	$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 	
 	global $view,$db;
 	
@@ -270,7 +270,7 @@ function exec_ogp_module() {
 											break;
 									}
 									mysqli_close($link);
-									$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+									$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 								}
 							}
 							else
@@ -289,7 +289,7 @@ function exec_ogp_module() {
 											break;
 									}
 									mysql_close($link);
-									$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix);
+									$modDb->connect($db_host,$db_user,$db_pass,$db_name,$table_prefix,isset($db_port)?$db_port:NULL);
 								}
 							}
 						}