diff --git a/server/core/config.c b/server/core/config.c
index a0bc6e3d0..093e8bc35 100644
--- a/server/core/config.c
+++ b/server/core/config.c
@@ -211,10 +211,18 @@ int		rval;
 		if (mysql_real_connect(conn, NULL, NULL, NULL, NULL, 0, NULL, 0)) {
 			char *ptr;
 			version_string = (char *)mysql_get_server_info(conn);
+			unsigned int server_version = mysql_get_server_version(conn);
 			ptr = strstr(version_string, "-embedded");
 			if (ptr) {
 				*ptr = '\0';
 			}
+			if (server_version >= 100000)
+			{
+			    char* tmpstr = malloc(strlen(version_string) + strlen("5.5.5-") + 1);
+			    strcpy(tmpstr,"5.5.5-");
+			    strcat(tmpstr,version_string);
+			    version_string = tmpstr;
+			}
 		}
 		mysql_close(conn);
 	}