diff --git a/configure.ac b/configure.ac
index dc6736c..b30c03f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,9 +215,14 @@ AM_CONDITIONAL(USE_CSHARP, test "${ac_cv_my_have_csharp}" = "yes")
 
 # Build the movie thumbnailer?
 ac_cv_my_have_ffmpeg="yes"
-PKG_CHECK_MODULES([LIBAVCODEC], [libavcodec], [:], [ac_cv_my_have_ffmpeg=no])
-PKG_CHECK_MODULES([LIBAVFORMAT], [libavformat], [:], [ac_cv_my_have_ffmpeg=no])
-PKG_CHECK_MODULES([LIBSWSCALE], [libswscale], [:], [ac_cv_my_have_ffmpeg=no])
+PKG_CHECK_MODULES([LIBAVCODEC], [libavcodec-uninstalled], [:], [ac_cv_my_have_ffmpeg=no])
+PKG_CHECK_MODULES([LIBAVFORMAT], [libavformat-uninstalled], [:], [ac_cv_my_have_ffmpeg=no])
+PKG_CHECK_MODULES([LIBSWSCALE], [libswscale-uninstalled], [:], [ac_cv_my_have_ffmpeg=no])
+if test "${ac_cv_my_have_ffmpeg}" = "no"; then
+  PKG_CHECK_MODULES([LIBAVCODEC], [libavcodec], [:], [ac_cv_my_have_ffmpeg=no])
+  PKG_CHECK_MODULES([LIBAVFORMAT], [libavformat], [:], [ac_cv_my_have_ffmpeg=no])
+  PKG_CHECK_MODULES([LIBSWSCALE], [libswscale], [:], [ac_cv_my_have_ffmpeg=no])
+fi
 AM_CONDITIONAL(USE_FFMPEG, test "${ac_cv_my_have_ffmpeg}" = "yes")
 
 # Build CGAL stuff?
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 6d486fb..b08fe02 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -36,13 +36,13 @@ endif
 
 makemovie_SOURCES = makemovie.c
 makemovie_LDADD = ../pipi/libpipi.la
-makemovie_CFLAGS = $(LIBAVCODEC_CFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBSWSCALE_CFLAGS)
-makemovie_LDFLAGS = $(LIBAVCODEC_LIBS) $(LIBAVFORMAT_LIBS) $(LIBSWSCALE_LIBS)
+makemovie_CFLAGS = $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS) $(LIBSWSCALE_CFLAGS)
+makemovie_LDFLAGS = $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS) $(LIBSWSCALE_LIBS)
 
 storyboard_SOURCES = storyboard.c
 storyboard_LDADD = ../pipi/libpipi.la
-storyboard_CFLAGS = $(LIBAVCODEC_CFLAGS) $(LIBAVFORMAT_CFLAGS) $(LIBSWSCALE_CFLAGS)
-storyboard_LDFLAGS = $(LIBAVCODEC_LIBS) $(LIBAVFORMAT_LIBS) $(LIBSWSCALE_LIBS)
+storyboard_CFLAGS = $(LIBAVFORMAT_CFLAGS) $(LIBAVCODEC_CFLAGS) $(LIBSWSCALE_CFLAGS)
+storyboard_LDFLAGS = $(LIBAVFORMAT_LIBS) $(LIBAVCODEC_LIBS) $(LIBSWSCALE_LIBS)
 
 if USE_CGAL
 img2twit = img2twit