diff --git a/configure b/configure
index d98aafde96a0e1264aaab8b3ff19a3c6a609d7a6..4a4daf669a5a61fc008906196ebe901b7e3e2d65 100755
--- a/configure
+++ b/configure
@@ -88,6 +88,7 @@ show_help(){
   echo "  --enable-amr_if2         enable amr_wb IF2 audio codec"
   echo "  --enable-sunmlib         use Sun medialib [default=no]"
   echo "  --enable-pthreads        use pthreads [default=no]"
+  echo "  --enable-x11grab         enable X11 grabbing [default=no]"
   echo "  --enable-dc1394          enable IIDC-1394 grabbing using libdc1394"
   echo "                           and libraw1394 [default=no]"
   echo "  --enable-swscaler        software scaler support [default=no]"
@@ -442,6 +443,7 @@ CONFIG_LIST='
     video4linux
     video4linux2
     wince
+    x11grab
     x264
     xvid
     zlib
@@ -574,6 +576,7 @@ video4linux2="yes"
 bktr="no"
 audio_oss="yes"
 audio_beos="no"
+x11grab="no"
 dv1394="yes"
 dc1394="no"
 network="yes"
@@ -955,6 +958,8 @@ for opt do
   ;;
   --enable-avisynth) avisynth="yes";
   ;;
+  --enable-x11grab) x11grab="yes";
+  ;;
   --enable-dc1394) dc1394="yes"
     pkg_requires="$pkg_requires libraw1394"
   ;;
@@ -1163,6 +1168,11 @@ EOF
             echo "FAAD test failed."
         fi
     fi
+
+    if test "$x11grab" != "no"; then
+        echo "The X11 grabber is under GPL and --enable-gpl is not specified."
+        fail="yes"
+    fi
 fi
 
 if test "$fail" = "yes"; then
@@ -1661,6 +1671,7 @@ struct v4l2_buffer dummy1;
 EOF
 
 # Deal with the x11 frame grabber
+enabled x11grab                         &&
 enabled gpl                             &&
 enabled x11_grab_device_demuxer         &&
 check_header X11/Xlib.h                 &&
diff --git a/libavformat/Makefile b/libavformat/Makefile
index c76f902701e3d5b8764ec26988f282747c86cb06..d9c9644ade8a8fc0be15fb929c33a90dd85ac7a0 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -123,12 +123,15 @@ OBJS-$(CONFIG_WC3_DEMUXER)               += wc3movie.o
 OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.o
 OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.o
 OBJS-$(CONFIG_WV_DEMUXER)                += wv.o
-OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.o
 OBJS-$(CONFIG_YUV4MPEGPIPE_MUXER)        += yuv4mpeg.o
 OBJS-$(CONFIG_YUV4MPEGPIPE_DEMUXER)      += yuv4mpeg.o
 
 OBJS+= framehook.o
 
+ifeq ($(CONFIG_X11GRAB),yes)
+OBJS-$(CONFIG_X11_GRAB_DEVICE_DEMUXER)   += x11grab.o
+endif
+
 ifeq ($(CONFIG_VIDEO4LINUX),yes)
 OBJS-$(CONFIG_VIDEO_GRAB_DEVICE_DEMUXER) += grab.o
 endif