diff --git a/DOCS/en/documentation.html b/DOCS/en/documentation.html
index 8487c2f2e4..77ff6db79c 100644
--- a/DOCS/en/documentation.html
+++ b/DOCS/en/documentation.html
@@ -814,6 +814,15 @@
   Check if you have <CODE>codecs.conf</CODE> in your home directory
   (<CODE>~/.mplayer/codecs.conf</CODE>) left from old MPlayer versions, and remove it.</P>
 
+<P>Note that if you have a <CODE>codecs.conf</CODE> in <CODE>~/.mplayer/</CODE>,
+  the builtin and system <CODE>codecs.conf</CODE> will be ignored completely.
+  Do not do this unless you want to fiddle with MPlayer internals as this can
+  can cause many problems.  If you want to change the codecs search order, use
+  the <CODE>-vc</CODE>, <CODE>-ac</CODE>, <CODE>-vfm</CODE>, or <CODE>-afm</CODE>
+  options either on the command line or in your config file (see the manual
+  page).</P>
+
+
 <P><B>Debian users</B> can build a <CODE>.deb</CODE> package for themselves,
   it's very simple. Just exec <CODE>fakeroot debian/rules binary</CODE> in
   MPlayer's root directory. See
diff --git a/DOCS/en/faq.html b/DOCS/en/faq.html
index ae2bfe217b..b1296c6f09 100644
--- a/DOCS/en/faq.html
+++ b/DOCS/en/faq.html
@@ -464,8 +464,8 @@
 
   <DT>Q: I got this playing MPEG files: Can't find codec for video format
     0x10000001!</DT>
-  <DD>A: You have an old version of codecs.conf at <CODE>~/.mplayer/</CODE>.
-    Upgrade it from <CODE>/etc/</CODE>.<BR>
+  <DD>A: You have an old version of codecs.conf at <CODE>~/.mplayer/</CODE>,
+    <CODE>/etc/</CODE>, <CODE>/usr/local/etc/</CODE> or similar. Remove it.<BR>
     <B>OR</B> you have the <CODE>vc=</CODE> option or something similar in your
     config file(s).</DD>
   <DD>&nbsp;</DD>