diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 8ef63ec5df..7461976e20 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -720,6 +720,11 @@ Display even less output and status messages than with \-quiet.
 Show the description and content of a profile.
 .
 .TP
+.B \-use-filedir-conf
+Look for file-specific configuration file in the same directory as
+the file that is been played.
+.
+.TP
 .B "\-v\ \ \ \ \ "
 Increment verbosity level, one level for each \-v
 found on the command line.
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 8d5a0f710c..62b6eac153 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -100,6 +100,7 @@ extern int readPPOpt(void *conf, char *arg);
 extern void revertPPOpt(void *conf, char* opt);
 extern char* pp_help;
 extern int enable_mouse_movements;
+extern int use_filedir_conf;
 
 m_option_t vd_conf[]={
 	{"help", "Use MPlayer with an appropriate video file instead of live partners to avoid vd.\n", CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
@@ -277,6 +278,8 @@ m_option_t mplayer_opts[]={
 
 //---------------------- mplayer-only options ------------------------
 
+	{"use-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
+	{"use-filedir-conf", &use_filedir_conf, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
 #ifdef CRASH_DEBUG
 	{"crash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
 	{"nocrash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
diff --git a/mplayer.c b/mplayer.c
index 9936181966..2f56a063ff 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -413,6 +413,7 @@ short edl_muted  = 0; ///< Stores whether EDL is currently in muted mode.
 short edl_decision = 0; ///< 1 when an EDL operation has been made.
 FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode.
 float begin_skip = MP_NOPTS_VALUE; ///< start time of the current skip while on edlout mode
+int use_filedir_conf;
 
 static unsigned int inited_flags=0;
 #define INITED_VO 1
@@ -854,7 +855,7 @@ void load_per_file_config (m_config_t* conf, const char *const file)
 
     sprintf (cfg, "%s.conf", file);
     
-    if (!stat (cfg, &st))
+    if (use_filedir_conf && !stat (cfg, &st))
     {
 	mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_LoadingConfig, cfg);
 	m_config_parse_config_file (conf, cfg);