diff --git a/configure b/configure
index d71688d226..a206f29ee1 100755
--- a/configure
+++ b/configure
@@ -1256,6 +1256,7 @@ vorbis_decoder_select="mdct"
 vorbis_encoder_select="mdct"
 vp6a_decoder_select="vp6_decoder"
 vp6f_decoder_select="vp6_decoder"
+vp8_decoder_select="h264dsp"
 wmapro_decoder_select="mdct"
 wmav1_decoder_select="mdct"
 wmav1_encoder_select="mdct"
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 7f6f7f45b1..5e971db540 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -9,9 +9,7 @@ YASM-OBJS-$(CONFIG_FFT)                += x86/fft_mmx.o                 \
 YASM-OBJS-$(CONFIG_GPL)                += x86/h264_deblock_sse2.o       \
                                           x86/h264_idct_sse2.o          \
 
-YASM-OBJS-$(CONFIG_H264_DECODER)       += x86/h264_intrapred.o          \
-
-YASM-OBJS-$(CONFIG_VP8_DECODER)        += x86/h264_intrapred.o          \
+YASM-OBJS-$(CONFIG_H264DSP)            += x86/h264_intrapred.o          \
 
 MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
 MMX-OBJS-$(CONFIG_MP1FLOAT_DECODER)    += x86/mpegaudiodec_mmx.o