diff --git a/configure.in b/configure.in
index 80598846..22cd35fe 100644
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ fi
 
 AC_DEFINE_UNQUOTED(CONFFILE,"${CONFFILE}",Where the config file is)
 
-use_ffmpeg=false;
+use_ffmpeg=true;
 use_upnp=false;
 use_ssl=false
 use_iconv=true
@@ -74,8 +74,8 @@ AC_ARG_ENABLE(musepack,[  --enable-musepack       Enable Musepack support],
                       use_musepack=true;
                       CPPFLAGS="${CPPFLAGS} -DMUSEPACK")
 
-AC_ARG_ENABLE(ffmpeg,[  --enable-ffmpeg     Enable ffmpeg transcode support],
-                      use_ffmpeg=true;)
+AC_ARG_ENABLE(ffmpeg, AC_HELP_STRING([--disable-ffmpeg], [Disable ffmpeg transcoding plugin]),
+                      use_ffmpeg=false)
 
 AC_ARG_ENABLE(upnp,[  --enable-upnp       Enable upnp support],
                       CPPFLAGS="${CPPFLAGS} -DUPNP"; use_upnp=true;)