diff --git a/CHANGES b/CHANGES
index 7e0dae3cd6f8fc3390f7c14c0fbd0441088de762..526427f4a0f955bb4a11158d96ac9ae7003522df 100644
--- a/CHANGES
+++ b/CHANGES
@@ -110,6 +110,11 @@ MixMonitor
  * Added 'm' option, which stores a copy of the recording as a voicemail in the
    indicated mailboxes.
 
+MySQL
+-------------------
+ * The connect action in app_mysql now allows you to specify a port number to
+   connect to.  This is useful if you run a MySQL server on a non-standard
+   port number.
 
 OSP Applications
 -------------------
diff --git a/addons/app_mysql.c b/addons/app_mysql.c
index 9ee584e27af53c49b2710d130c27781563540375..594b78e523050a4c3b09ca46b3efa6ebb78b026a 100644
--- a/addons/app_mysql.c
+++ b/addons/app_mysql.c
@@ -59,7 +59,7 @@ static const char descrip[] =
 "Syntax:\n"
 "  MYSQL(Set timeout <num>)\n"
 "    Set the connection timeout, in seconds.\n"
-"  MYSQL(Connect connid dhhost dbuser dbpass dbname [dbcharset])\n"
+"  MYSQL(Connect connid dhhost[:dbport] dbuser dbpass dbname [dbcharset])\n"
 "    Connects to a database.  Arguments contain standard MySQL parameters\n"
 "    passed to function mysql_real_connect.  Optional parameter dbcharset\n"
 "    defaults to 'latin1'.  Connection identifer returned in ${connid}\n"
@@ -322,6 +322,8 @@ static int aMYSQL_connect(struct ast_channel *chan, char *data)
 	MYSQL *mysql;
 	int timeout;
 	const char *ctimeout;
+	unsigned int port = 0;
+	char *port_str;
 
 	AST_NONSTANDARD_APP_ARGS(args, data, ' ');
 
@@ -348,7 +350,15 @@ static int aMYSQL_connect(struct ast_channel *chan, char *data)
 		mysql_options(mysql, MYSQL_SET_CHARSET_NAME, args.dbcharset);
 	}
 
-	if (! mysql_real_connect(mysql, args.dbhost, args.dbuser, args.dbpass, args.dbname, 0, NULL,
+	if ((port_str = strchr(args.dbhost, ':'))) {
+		*port_str++ = '\0';
+		if (sscanf(port_str, "%u", &port) != 1) {
+			ast_log(LOG_WARNING, "Invalid port: '%s'\n", port_str);
+			port = 0;
+		}
+	}
+
+	if (!mysql_real_connect(mysql, args.dbhost, args.dbuser, args.dbpass, args.dbname, port, NULL,
 #ifdef CLIENT_MULTI_STATEMENTS
 			CLIENT_MULTI_STATEMENTS | CLIENT_MULTI_RESULTS
 #elif defined(CLIENT_MULTI_QUERIES)