diff --git a/configure b/configure
index fe20844a519cfb15128a1e2a2cbbc88dd0bdd907..56606aaae6344fb553adf53e5e1b69348269fb28 100755
--- a/configure
+++ b/configure
@@ -141,6 +141,7 @@ show_help(){
   echo "  --disable-altivec        disable AltiVec optimizations"
   echo "  --disable-mmx            disable MMX optimizations"
   echo "  --disable-mmx2           disable MMX2 optimizations"
+  echo "  --disable-sse            disable SSE optimizations"
   echo "  --disable-ssse3          disable SSSE3 optimizations"
   echo "  --disable-armv5te        disable armv5te optimizations"
   echo "  --disable-armv6          disable armv6 optimizations"
@@ -820,6 +821,7 @@ ARCH_EXT_LIST='
     mmx
     mmx2
     neon
+    sse
     ssse3
     vis
 '
@@ -946,7 +948,8 @@ mmi_deps="mips"
 mmx_deps="x86"
 mmx2_deps="x86 mmx"
 neon_deps="arm"
-ssse3_deps="x86"
+sse_deps="mmx"
+ssse3_deps="x86 sse"
 vis_deps="sparc"
 
 # common features
@@ -2136,6 +2139,7 @@ echo "big-endian                ${bigendian-no}"
 if test $arch = "x86_32" -o $arch = "x86_64"; then
     echo "yasm                      ${yasm-no}"
     echo "MMX enabled               ${mmx-no}"
+    echo "SSE enabled               ${sse-no}"
     echo "CMOV enabled              ${cmov-no}"
     echo "CMOV is fast              ${fast_cmov-no}"
     echo "EBX available             ${ebx_available-no}"
diff --git a/libavcodec/x86/cpuid.c b/libavcodec/x86/cpuid.c
index cd33334ecf43533df4302239275571d355bcf4c8..664bac35abaf43065b64bec4586435ffdb019a9e 100644
--- a/libavcodec/x86/cpuid.c
+++ b/libavcodec/x86/cpuid.c
@@ -83,7 +83,7 @@ int mm_support(void)
             rval |= FF_MM_MMX;
         if (std_caps & (1<<25))
             rval |= FF_MM_MMXEXT
-#if !defined(__GNUC__) || __GNUC__ > 2
+#ifdef HAVE_SSE
                   | FF_MM_SSE;
         if (std_caps & (1<<26))
             rval |= FF_MM_SSE2;