diff --git a/doc/developer.texi b/doc/developer.texi
index 59da187208..6e65b42738 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -180,10 +180,10 @@ should also be avoided if they don't make the code easier to understand.
 @end itemize
 
 @subsection Editor configuration
-In order to configure Vim to follow Libav formatting conventions, paste
+In order to configure Vim to follow FFmpeg formatting conventions, paste
 the following snippet into your @file{.vimrc}:
 @example
-" indentation rules for libav: 4 spaces, no tabs
+" indentation rules for FFmpeg: 4 spaces, no tabs
 set expandtab
 set shiftwidth=4
 set softtabstop=4
@@ -299,7 +299,7 @@ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}:
     always check values read from some untrusted source before using them
     as array index or other risky things.
 @item
-    Remember to check if you need to bump versions for the specific libav
+    Remember to check if you need to bump versions for the specific libav*
     parts (libavutil, libavcodec, libavformat) you are changing. You need
     to change the version integer.
     Incrementing the first component means no backward compatibility to
diff --git a/doc/faq.texi b/doc/faq.texi
index dccde2d6f7..88d8b37553 100644
--- a/doc/faq.texi
+++ b/doc/faq.texi
@@ -451,7 +451,7 @@ See @url{http://www.parashift.com/c++-faq-lite/mixing-c-and-cpp.html#faq-32.3}
 
 @section I'm using libavutil from within my C++ application but the compiler complains about 'UINT64_C' was not declared in this scope
 
-Libav is a pure C project using C99 math features, in order to enable C++
+FFmpeg is a pure C project using C99 math features, in order to enable C++
 to use them you have to append -D__STDC_CONSTANT_MACROS to your CXXFLAGS
 
 @section I have a file in memory / a API different from *open/*read/ libc how do I use it with libavformat?