diff --git a/INSTALL b/INSTALL
index e031aa58..d95c83c8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -30,8 +30,8 @@ Libraries:
         from <http://avahi.org/>
  - sqlite3 3.5.0+ with unlock notify API enabled (read below)
         from <http://sqlite.org/download.html>
- - ffmpeg 0.5.1+/0.6+
-        from <http://ffmpeg.org/releases/>
+ - libav 0.6+ (or ffmpeg 0.5.1+)
+        from <http://libav.org/releases/>
  - libconfuse
         from <http://www.nongnu.org/confuse/>
  - libevent 1.4+
@@ -68,17 +68,20 @@ sqlite3_unlock_notify symbol in the sqlite3 library). Refer to the sqlite3
 documentation, look for SQLITE_ENABLE_UNLOCK_NOTIFY.
 
 
-Note about ffmpeg
------------------
+Note about libav (ffmpeg)
+-------------------------
 
-ffmpeg is a central piece of forked-daapd and most other FLOSS multimedia
-applications. The version of ffmpeg you use will potentially have a great
-influence on your experience with forked-daapd.
+libav (ffmpeg) is a central piece of forked-daapd and most other FLOSS
+multimedia applications. The version of libav you use will potentially have a
+great influence on your experience with forked-daapd.
 
-The following versions of ffmpeg are supported and known to work:
+The following versions of libav (ffmpeg) are supported and known to work:
  - ffmpeg 0.5.x: has issues with metadata (tags) extraction, notably with
    MP3 files and ID3 tags in general;
- - ffmpeg 0.6.x: known to work better with regard to metadata extraction
+ - libav 0.6.x: known to work better with regard to metadata extraction
+
+Note that forked-daapd uses libav since the ffmpeg/libav fork during the
+0.6.x series.
 
 
 Building from the git tree
diff --git a/README b/README
index 7e083986..4d24b2b3 100644
--- a/README
+++ b/README
@@ -114,11 +114,11 @@ audio device:
 Supported formats
 -----------------
 
-forked-daapd should support pretty much all media formats. It uses ffmpeg to
-extract metadata and decode the files on the fly when the client doesn't
-support the format.
+forked-daapd should support pretty much all media formats. It relies on libav
+(ffmpeg) to extract metadata and decode the files on the fly when the client
+doesn't support the format.
 
-However, ffmpeg is not necessarily very good at extracting metadata, so some
+However, libav is not necessarily very good at extracting metadata, so some
 formats may cause problems. FLAC, Musepack and WMA use custom metadata
 extractors to work around that.
 
@@ -179,8 +179,8 @@ Artwork
 
 forked-daapd has /some/ support for artwork, with a number of limitations.
 
-Embedded artwork is not supported; ffmpeg doesn't support this yet, if and
-when this is added to ffmpeg, forked-daapd will support it.
+Embedded artwork is not supported; libav (ffmpeg) doesn't support this yet, if
+and when this is added to libav, forked-daapd will support it.
 
 Your artwork must be in PNG or JPEG format, dimensions do not matter;
 forked-daapd scales down (never up) the artwork on-the-fly to match the
diff --git a/configure.in b/configure.in
index 36f30246..7f1e14b7 100644
--- a/configure.in
+++ b/configure.in
@@ -130,10 +130,10 @@ AC_RUN_IFELSE(
 AC_LANG_POP([C])
 LIBS="$save_LIBS"
 
-PKG_CHECK_MODULES(FFMPEG, [ libavcodec libavformat libswscale libavutil ])
+PKG_CHECK_MODULES(LIBAV, [ libavcodec libavformat libswscale libavutil ])
 dnl Check for av_lock_manager (ffmpeg >= 0.5.1)
 save_LIBS="$LIBS"
-AC_CHECK_LIB([avcodec], [av_lockmgr_register], , AC_MSG_ERROR([ffmpeg >= 0.5.1 required]))
+AC_CHECK_LIB([avcodec], [av_lockmgr_register], , AC_MSG_ERROR([libav (ffmpeg) >= 0.5.1 required]))
 LIBS="$save_LIBS"
 
 PKG_CHECK_MODULES(MINIXML, [ mxml ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 07c0bd13..0d6762b2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,12 +51,12 @@ forked_daapd_CPPFLAGS = -D_GNU_SOURCE \
 	@OSS4CPPFLAGS@
 
 forked_daapd_CFLAGS = \
-	@ZLIB_CFLAGS@ @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @FFMPEG_CFLAGS@ \
+	@ZLIB_CFLAGS@ @AVAHI_CFLAGS@ @SQLITE3_CFLAGS@ @LIBAV_CFLAGS@ \
 	@CONFUSE_CFLAGS@ @TAGLIB_CFLAGS@ @MINIXML_CFLAGS@ @LIBPLIST_CFLAGS@ \
 	@LIBGCRYPT_CFLAGS@ @GPG_ERROR_CFLAGS@ @ALSA_CFLAGS@
 
 forked_daapd_LDADD = -lrt \
-	@ZLIB_LIBS@ @AVAHI_LIBS@ @SQLITE3_LIBS@ @FFMPEG_LIBS@ \
+	@ZLIB_LIBS@ @AVAHI_LIBS@ @SQLITE3_LIBS@ @LIBAV_LIBS@ \
 	@CONFUSE_LIBS@ @FLAC_LIBS@ @TAGLIB_LIBS@ @LIBEVENT_LIBS@ \
 	@LIBAVL_LIBS@ @MINIXML_LIBS@ @ANTLR3C_LIBS@ @LIBPLIST_LIBS@ \
 	@LIBGCRYPT_LIBS@ @GPG_ERROR_LIBS@ @ALSA_LIBS@ @LIBUNISTRING@