diff --git a/autoconf/m4/video.m4 b/autoconf/m4/video.m4
index 49a05c91e9..b48fba1e2a 100644
--- a/autoconf/m4/video.m4
+++ b/autoconf/m4/video.m4
@@ -70,8 +70,14 @@ if test "$with_ffmpeg" = "yes"; then
 		fi
 	else
 dnl System FFMpeg
+dnl HACK: $prefix is set to NONE if not user specified
+		if test "$prefix" = "NONE"; then
+			our_installdir="/opt"
+		else
+			our_installdir="$prefix"
+		fi
 dnl We might as well throw in GPL stuff as we're bound to GPL by libmad anyway.
-		FFMPEG_CONFFLAGS="--enable-gpl --disable-programs --disable-doc --disable-avdevice --disable-swresample --disable-postproc --disable-avfilter"
+		FFMPEG_CONFFLAGS="--shlibdir=$our_installdir/stepmania-$VERSION --enable-gpl --disable-programs --disable-doc --disable-avdevice --disable-swresample --disable-postproc --disable-avfilter"
 		if test "$host_os" = "mingw32"; then
 			FFMPEG_CONFFLAGS="$FFMPEG_CONFFLAGS --arch=x86"
 		fi
diff --git a/bundle/Makefile.am b/bundle/Makefile.am
index 896c503518..bab2301c8a 100644
--- a/bundle/Makefile.am
+++ b/bundle/Makefile.am
@@ -12,6 +12,12 @@ if WINDOWS
 	rm -f ../*.dll
 endif
 
+install:
+	cd ffmpeg && $(MAKE) install-libs
+
+uninstall:
+	cd ffmpeg && $(MAKE) uninstall-libs
+
 clean-local: del-dlls
 	cd ffmpeg && $(MAKE) clean