diff --git a/Makefile b/Makefile
index eab06b4c0b..93536f318a 100644
--- a/Makefile
+++ b/Makefile
@@ -521,7 +521,6 @@ SRCS_MPLAYER = mplayer.c \
                libvo/video_out.c \
                libvo/vo_mpegpes.c \
                libvo/vo_null.c \
-               libvo/vo_yuv4mpeg.c \
                $(addprefix libvo/,$(VO_SRCS)) \
 
 SRCS_MPLAYER-$(APPLE_IR)     += input/appleir.c
diff --git a/configure b/configure
index 4eed6b0b21..2991f1c806 100755
--- a/configure
+++ b/configure
@@ -385,6 +385,7 @@ Video output:
   --disable-tga            disable Targa video output [enable]
   --disable-pnm		   disable PNM video output [enable]
   --disable-md5sum	   disable md5sum video output [enable]
+  --disable-yuv4mpeg	   disable md5sum video output [enable]
 
 Audio output:
   --disable-alsa         disable ALSA audio output [autodetect]
@@ -533,6 +534,7 @@ _png=auto
 _jpeg=auto
 _pnm=yes
 _md5sum=yes
+_yuv4mpeg=yes
 _gif=auto
 _gl=auto
 _ggi=auto
@@ -852,6 +854,8 @@ for ac_option do
   --disable-pnm)	_pnm=no		;;
   --enable-md5sum)	_md5sum=yes	;;
   --disable-md5sum)	_md5sum=no	;;
+  --enable-yuv4mpeg)	_yuv4mpeg=yes	;;
+  --disable-yuv4mpeg)	_yuv4mpeg=no	;;
   --enable-gif)	_gif=yes	;;
   --disable-gif)	_gif=no		;;
   --enable-gl)		_gl=yes		;;
@@ -3779,6 +3783,18 @@ fi
 echores "$_md5sum"
 
 
+echocheck "yuv4mpeg support"
+if test "$_yuv4mpeg" = yes; then
+  _def_yuv4mpeg="#define HAVE_YUV4MPEG"
+  _vosrc="$_vosrc vo_yuv4mpeg.c"
+  _vomodules="yuv4mpeg $_vomodules"
+else
+  _def_yuv4mpeg="#undef HAVE_YUV4MPEG"
+  _novomodules="yuv4mpeg $_novomodules"
+fi
+echores "$_yuv4mpeg"
+
+
 echocheck "bl"
 if test "$_bl" = yes ; then
   _def_bl='#define HAVE_BL 1'
@@ -8369,6 +8385,9 @@ $_def_pnm
 /* enable md5sum support */
 $_def_md5sum
 
+/* enable yuv4mpeg support */
+$_def_yuv4mpeg
+
 /* enable GIF support */
 $_def_gif
 $_def_gif_4
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 762ef7cdcb..5496eeb59a 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -221,7 +221,9 @@ const vo_functions_t* const video_out_drivers[] =
         &video_out_xvmc,
 #endif
 	&video_out_mpegpes,
+#ifdef HAVE_YUV4MPEG
 	&video_out_yuv4mpeg,
+#endif
 #ifdef HAVE_PNG
 	&video_out_png,
 #endif