diff --git a/addons/app_mysql.c b/addons/app_mysql.c
index db33c11cb..3bc027b5e 100644
--- a/addons/app_mysql.c
+++ b/addons/app_mysql.c
@@ -92,7 +92,8 @@ exten => s,9,MYSQL(Disconnect ${connid})
 
 AST_MUTEX_DEFINE_STATIC(_mysql_mutex);
 
-#define MYSQL_CONFIG "mysql.conf"
+#define MYSQL_CONFIG "app_mysql.conf"
+#define MYSQL_CONFIG_OLD "mysql.conf"
 #define AST_MYSQL_ID_DUMMY   0
 #define AST_MYSQL_ID_CONNID  1
 #define AST_MYSQL_ID_RESID   2
@@ -586,6 +587,11 @@ static int load_module(void)
 	struct ast_config *cfg = ast_config_load(MYSQL_CONFIG, config_flags);
 	const char *temp;
 
+	if (!cfg) {
+		/* Backwards compatibility ftw */
+		cfg = ast_config_load(MYSQL_CONFIG_OLD, config_flags);
+	}
+
 	if (cfg) {
 		if ((temp = ast_variable_retrieve(cfg, "general", "nullvalue"))) {
 			if (!strcasecmp(temp, "nullstring")) {
diff --git a/configs/mysql.conf.sample b/configs/app_mysql.conf.sample
similarity index 100%
rename from configs/mysql.conf.sample
rename to configs/app_mysql.conf.sample