diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 0a9ca1baac..09661b6ed3 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -7097,7 +7097,7 @@ if vrc_strategy is not set to 0.
 Use internal lavc ratecontrol (default).
 .IPs 1
 Use XviD ratecontrol (experimental; requires MEncoder to be compiled
-with XviD support).
+with support for XviD 1.1 or higher).
 .RE
 .PD 1
 .
diff --git a/configure b/configure
index 8b5b90ab5d..57f172fef3 100755
--- a/configure
+++ b/configure
@@ -6364,7 +6364,6 @@ EOF
     _xvid4=yes
     _def_xvid3='#undef HAVE_XVID3'
     _def_xvid4='#define HAVE_XVID4 1'
-    _def_lavc_xvid='#define CONFIG_XVID 1'
     _codecmodules="xvid $_codecmodules"
   else
     _xvid=no
@@ -6376,6 +6375,22 @@ EOF
 fi
 echores "$_xvid"
 
+if test "$_xvid4" = yes ; then
+  echocheck "XviD 1.1 or higher"
+  cat > $TMPC << EOF
+#include <xvid.h>
+int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
+EOF
+  if cc_check $_inc_xvid $_ld_xvid $_ld_lb ; then
+    _lavc_xvid=yes
+    _def_lavc_xvid='#define CONFIG_XVID 1'
+  else
+    _lavc_xvid=no
+    _def_lavc_xvid='#undef CONFIG_XVID'
+  fi
+  echores "$_lavc_xvid"
+fi
+
 _xvidcompat=no
 _def_decore_xvid='#undef DECORE_XVID'
 _def_encore_xvid='#undef ENCORE_XVID'
@@ -7387,7 +7402,7 @@ AMR_NB_FIXED=$_amr_nb_fixed
 AMR_WB=$_amr_wb
 `echo $_libavcodecs | tr '[a-z] ' '[A-Z]\n' | sed 's/^/CONFIG_/;s/$/=yes/'`
 CONFIG_FAAC=$_faac
-CONFIG_XVID=$_xvid4
+CONFIG_XVID=$_lavc_xvid
 CONFIG_GPL=yes
 CONFIG_MUXERS=yes