diff --git a/ThePimp/Makefile.am b/ThePimp/Makefile.am
index fb56186..bf9125a 100644
--- a/ThePimp/Makefile.am
+++ b/ThePimp/Makefile.am
@@ -1,6 +1,6 @@
 # $Id: $
 
-pkglibdir = $(libdir)/ThePimp
+mypkglibdir = $(libdir)/ThePimp
 
 pimp_sources = \
 	src/AssemblyInfo.cs \
@@ -32,7 +32,7 @@ image_sources = \
 	images/about.svg
 
 if USE_CSHARP
-pkglib_DATA = ThePimp.exe
+mypkglib_DATA = ThePimp.exe
 bin_SCRIPTS = pimp
 endif
 
diff --git a/bootstrap b/bootstrap
index 6e40f89..4103830 100755
--- a/bootstrap
+++ b/bootstrap
@@ -37,7 +37,7 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/n
 
 # Check for automake
 amvers="no"
-for v in 11 10 9 8 7 6 5; do
+for v in 15 14 13 12 11 10 9 8 7 6 5; do
   if automake-1.${v} --version >/dev/null 2>&1; then
     amvers="-1.${v}"
     break
diff --git a/configure.ac b/configure.ac
index 941115e..5b39aed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(libpipi, 0.0)
 AC_PREREQ(2.50)
 AC_CONFIG_AUX_DIR(.auto)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([no-define tar-ustar])
+AM_INIT_AUTOMAKE([subdir-objects no-define tar-ustar silent-rules])
 dnl AM_MAINTAINER_MODE
 
 AM_CONFIG_HEADER(config.h)
@@ -232,6 +232,8 @@ if test "${ac_cv_my_have_ffmpeg}" = "no"; then
   PKG_CHECK_MODULES([LIBAVFORMAT], [libavformat], [:], [ac_cv_my_have_ffmpeg=no])
   PKG_CHECK_MODULES([LIBSWSCALE], [libswscale], [:], [ac_cv_my_have_ffmpeg=no])
 fi
+# Disable for now
+ac_cv_my_have_ffmpeg="no"
 if test "${ac_cv_my_have_ffmpeg}" != "no"; then
   AC_DEFINE(USE_FFMPEG, 1, Define to 1 to use FFmpeg)
 fi
diff --git a/examples/dumpmovie.c b/examples/dumpmovie.c
index f6b34f5..59a6803 100644
--- a/examples/dumpmovie.c
+++ b/examples/dumpmovie.c
@@ -100,7 +100,7 @@ int main(int argc, char *argv[])
             continue;
         }
 
-        avcodec_decode_video(ctx, frame, &finished, packet.data, packet.size);
+        avcodec_decode_video2(ctx, frame, &finished, packet.data, packet.size);
         if(!finished)
         {
             av_free_packet(&packet);
diff --git a/examples/storyboard.c b/examples/storyboard.c
index 35f1c57..7a2d958 100644
--- a/examples/storyboard.c
+++ b/examples/storyboard.c
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
             continue;
         }
 
-        avcodec_decode_video(ctx, frame, &finished, packet.data, packet.size);
+        avcodec_decode_video2(ctx, frame, &finished, packet.data, packet.size);
         if(!finished)
         {
             av_free_packet(&packet);