diff --git a/bundle/ffmpeg/compat/plan9/head b/bundle/ffmpeg/compat/plan9/head
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/compat/plan9/printf b/bundle/ffmpeg/compat/plan9/printf
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/doc/doxy-wrapper.sh b/bundle/ffmpeg/doc/doxy-wrapper.sh
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/doc/examples/pc-uninstalled/libavcodec.pc b/bundle/ffmpeg/doc/examples/pc-uninstalled/libavcodec.pc
deleted file mode 100644
index 74fd44502d..0000000000
--- a/bundle/ffmpeg/doc/examples/pc-uninstalled/libavcodec.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/../../../libavcodec
-includedir=${pcfiledir}/../../..
-
-Name: libavcodec
-Description: FFmpeg codec library
-Version: 55.39.101
-Requires: libavutil = 52.48.101
-Conflicts:
-Libs: -L${libdir} -Wl,-rpath,${libdir} -lavcodec 
-Cflags: -I${includedir}
diff --git a/bundle/ffmpeg/doc/examples/pc-uninstalled/libavdevice.pc b/bundle/ffmpeg/doc/examples/pc-uninstalled/libavdevice.pc
deleted file mode 100644
index d4a94a7395..0000000000
--- a/bundle/ffmpeg/doc/examples/pc-uninstalled/libavdevice.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/../../../libavdevice
-includedir=${pcfiledir}/../../..
-
-Name: libavdevice
-Description: FFmpeg device handling library
-Version: 55.5.100
-Requires: libavfilter = 3.90.100, libavformat = 55.19.104
-Conflicts:
-Libs: -L${libdir} -Wl,-rpath,${libdir} -lavdevice -lavicap32 -lpsapi -lole32 -lstrmiids -luuid -lws2_32 -liconv -lm -lz -lpsapi -ladvapi32 -lshell32
-Cflags: -I${includedir}
diff --git a/bundle/ffmpeg/doc/examples/pc-uninstalled/libavfilter.pc b/bundle/ffmpeg/doc/examples/pc-uninstalled/libavfilter.pc
deleted file mode 100644
index c5a9bc9320..0000000000
--- a/bundle/ffmpeg/doc/examples/pc-uninstalled/libavfilter.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/../../../libavfilter
-includedir=${pcfiledir}/../../..
-
-Name: libavfilter
-Description: FFmpeg audio/video filtering library
-Version: 3.90.100
-Requires: libswresample = 0.17.104, libswscale = 2.5.101, libavformat = 55.19.104, libavcodec = 55.39.101, libavutil = 52.48.101
-Conflicts:
-Libs: -L${libdir} -Wl,-rpath,${libdir} -lavfilter -lavicap32 -lpsapi -lole32 -lstrmiids -luuid -lws2_32 -liconv -lm -lz -lpsapi -ladvapi32 -lshell32
-Cflags: -I${includedir}
diff --git a/bundle/ffmpeg/doc/examples/pc-uninstalled/libavformat.pc b/bundle/ffmpeg/doc/examples/pc-uninstalled/libavformat.pc
deleted file mode 100644
index b9bb3a9709..0000000000
--- a/bundle/ffmpeg/doc/examples/pc-uninstalled/libavformat.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/../../../libavformat
-includedir=${pcfiledir}/../../..
-
-Name: libavformat
-Description: FFmpeg container format library
-Version: 55.19.104
-Requires: libavcodec = 55.39.101
-Conflicts:
-Libs: -L${libdir} -Wl,-rpath,${libdir} -lavformat 
-Cflags: -I${includedir}
diff --git a/bundle/ffmpeg/doc/examples/pc-uninstalled/libavutil.pc b/bundle/ffmpeg/doc/examples/pc-uninstalled/libavutil.pc
deleted file mode 100644
index 1b44dda655..0000000000
--- a/bundle/ffmpeg/doc/examples/pc-uninstalled/libavutil.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/../../../libavutil
-includedir=${pcfiledir}/../../..
-
-Name: libavutil
-Description: FFmpeg utility library
-Version: 52.48.101
-Requires: 
-Conflicts:
-Libs: -L${libdir} -Wl,-rpath,${libdir} -lavutil 
-Cflags: -I${includedir}
diff --git a/bundle/ffmpeg/doc/examples/pc-uninstalled/libswresample.pc b/bundle/ffmpeg/doc/examples/pc-uninstalled/libswresample.pc
deleted file mode 100644
index b956e4e8ac..0000000000
--- a/bundle/ffmpeg/doc/examples/pc-uninstalled/libswresample.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/../../../libswresample
-includedir=${pcfiledir}/../../..
-
-Name: libswresample
-Description: FFmpeg audio resampling library
-Version: 0.17.104
-Requires: libavutil = 52.48.101
-Conflicts:
-Libs: -L${libdir} -Wl,-rpath,${libdir} -lswresample -lm
-Cflags: -I${includedir}
diff --git a/bundle/ffmpeg/doc/examples/pc-uninstalled/libswscale.pc b/bundle/ffmpeg/doc/examples/pc-uninstalled/libswscale.pc
deleted file mode 100644
index 9ad7330045..0000000000
--- a/bundle/ffmpeg/doc/examples/pc-uninstalled/libswscale.pc
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=
-exec_prefix=
-libdir=${pcfiledir}/../../../libswscale
-includedir=${pcfiledir}/../../..
-
-Name: libswscale
-Description: FFmpeg image rescaling library
-Version: 2.5.101
-Requires: libavutil = 52.48.101
-Conflicts:
-Libs: -L${libdir} -Wl,-rpath,${libdir} -lswscale 
-Cflags: -I${includedir}
diff --git a/bundle/ffmpeg/doc/texi2pod.pl b/bundle/ffmpeg/doc/texi2pod.pl
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/libavdevice/libavdevice.pc b/bundle/ffmpeg/libavdevice/libavdevice.pc
deleted file mode 100644
index 2cfb6922bd..0000000000
--- a/bundle/ffmpeg/libavdevice/libavdevice.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr/local
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libavdevice
-Description: FFmpeg device handling library
-Version: 55.5.100
-Requires: libavfilter = 3.90.100, libavformat = 55.19.104
-Requires.private: 
-Conflicts:
-Libs: -L${libdir} -lavdevice -lavicap32 -lpsapi -lole32 -lstrmiids -luuid -lws2_32 -liconv -lm -lz -lpsapi -ladvapi32 -lshell32
-Libs.private: 
-Cflags: -I${includedir}
diff --git a/bundle/ffmpeg/libavfilter/libavfilter.pc b/bundle/ffmpeg/libavfilter/libavfilter.pc
deleted file mode 100644
index 3b6262bed7..0000000000
--- a/bundle/ffmpeg/libavfilter/libavfilter.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr/local
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libavfilter
-Description: FFmpeg audio/video filtering library
-Version: 3.90.100
-Requires: libswresample = 0.17.104, libswscale = 2.5.101, libavformat = 55.19.104, libavcodec = 55.39.101, libavutil = 52.48.101
-Requires.private: 
-Conflicts:
-Libs: -L${libdir} -lavfilter -lavicap32 -lpsapi -lole32 -lstrmiids -luuid -lws2_32 -liconv -lm -lz -lpsapi -ladvapi32 -lshell32
-Libs.private: 
-Cflags: -I${includedir}
diff --git a/bundle/ffmpeg/libswresample/libswresample.pc b/bundle/ffmpeg/libswresample/libswresample.pc
deleted file mode 100644
index bb7757ced9..0000000000
--- a/bundle/ffmpeg/libswresample/libswresample.pc
+++ /dev/null
@@ -1,14 +0,0 @@
-prefix=/usr/local
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libswresample
-Description: FFmpeg audio resampling library
-Version: 0.17.104
-Requires: libavutil = 52.48.101
-Requires.private: 
-Conflicts:
-Libs: -L${libdir} -lswresample -lm
-Libs.private: 
-Cflags: -I${includedir}
diff --git a/bundle/ffmpeg/tests/copycooker.sh b/bundle/ffmpeg/tests/copycooker.sh
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tests/fate-run.sh b/bundle/ffmpeg/tests/fate-run.sh
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tests/fate-update.sh b/bundle/ffmpeg/tests/fate-update.sh
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tests/fate.sh b/bundle/ffmpeg/tests/fate.sh
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tests/ffserver-regression.sh b/bundle/ffmpeg/tests/ffserver-regression.sh
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tests/lavf-regression.sh b/bundle/ffmpeg/tests/lavf-regression.sh
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tests/regression-funcs.sh b/bundle/ffmpeg/tests/regression-funcs.sh
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tools/bisect-create b/bundle/ffmpeg/tools/bisect-create
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tools/clean-diff b/bundle/ffmpeg/tools/clean-diff
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tools/make_chlayout_test b/bundle/ffmpeg/tools/make_chlayout_test
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tools/missing_codec_desc b/bundle/ffmpeg/tools/missing_codec_desc
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tools/normalize.py b/bundle/ffmpeg/tools/normalize.py
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tools/patcheck b/bundle/ffmpeg/tools/patcheck
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tools/plotframes b/bundle/ffmpeg/tools/plotframes
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tools/unwrap-diff b/bundle/ffmpeg/tools/unwrap-diff
old mode 100644
new mode 100755
diff --git a/bundle/ffmpeg/tools/zmqshell.py b/bundle/ffmpeg/tools/zmqshell.py
old mode 100644
new mode 100755
diff --git a/configure.ac b/configure.ac
index a1a2f90a7b..8946e0798b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,7 +96,7 @@ if test x$enable_lto = xyes; then
 	fi
 fi
 
-AC_ARG_ENABLE(system-ffmpeg, AS_HELP_STRING([--with-system-ffmpeg], [Use system instead of bundled ffmpeg (UNSUPPORTED)]), system_ffmpeg=yes, system_ffmpeg=no)
+AC_ARG_WITH(system-ffmpeg, AS_HELP_STRING([--with-system-ffmpeg], [Use system instead of bundled ffmpeg (UNSUPPORTED)]), system_ffmpeg=yes, system_ffmpeg=no)
 AM_CONDITIONAL(SYSTEM_FFMPEG, test "$system_ffmpeg" = "yes")
 
 if test $system_ffmpeg = yes; then
@@ -117,6 +117,8 @@ dnl NOTE: This won't be hardcoded "yes" later when we implement --with-license
 	AC_DEFINE(HAVE_FFMPEG, 1, [FFMpeg is available])
 	CFLAGS="$CFLAGS -I$PWD/bundle/ffmpeg"
 	CXXFLAGS="$CXXFLAGS -I$PWD/bundle/ffmpeg"
+dnl Make the binary find our bundled libs
+	LDFLAGS="-Wl,-rpath=bundle/ffmpeg/libavutil,-rpath=bundle/ffmpeg/libavformat,-rpath=bundle/ffmpeg/libavcodec,-rpath=bundle/ffmpeg/libswscale"
 dnl Classic autoconf. This CANNOT be broken across multiple lines.
 	FFMPEG_LIBS="-L$PWD/bundle/ffmpeg/libavutil -lavutil -L$PWD/bundle/ffmpeg/libavformat -lavformat -L$PWD/bundle/ffmpeg/libavcodec -lavcodec -L$PWD/bundle/ffmpeg/libswscale -lswscale"
 fi