diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
index 2cd1fa4f46..76a741695b 100644
--- a/addons/res_config_mysql.c
+++ b/addons/res_config_mysql.c
@@ -47,7 +47,8 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/utils.h"
 #include "asterisk/threadstorage.h"
 
-#define RES_CONFIG_MYSQL_CONF "res_mysql.conf"
+#define RES_CONFIG_MYSQL_CONF "res_config_mysql.conf"
+#define RES_CONFIG_MYSQL_CONF_OLD "res_mysql.conf"
 #define	READHANDLE	0
 #define	WRITEHANDLE	1
 
@@ -1413,6 +1414,11 @@ static int parse_config(int reload)
 	struct mysql_conn *cur;
 
 	if ((config = ast_config_load(RES_CONFIG_MYSQL_CONF, config_flags)) == CONFIG_STATUS_FILEMISSING) {
+		/* Support old config file name */
+		config = ast_config_load(RES_CONFIG_MYSQL_CONF_OLD, config_flags);
+	}
+
+	if (config == CONFIG_STATUS_FILEMISSING) {
 		return 0;
 	} else if (config == CONFIG_STATUS_FILEUNCHANGED) {
 		return 0;
diff --git a/configs/res_mysql.conf.sample b/configs/res_config_mysql.conf.sample
similarity index 100%
rename from configs/res_mysql.conf.sample
rename to configs/res_config_mysql.conf.sample