diff --git a/eclass/qt4-build.eclass b/eclass/qt4-build.eclass
index 7589185..44a5f3f 100644
--- a/eclass/qt4-build.eclass
+++ b/eclass/qt4-build.eclass
@@ -51,6 +51,13 @@ if version_is_at_least 4.8; then
        version_is_at_least 4.8.3 || IUSE+=" qpa"
 fi
 
+IUSE+=" cpudetection" 
+
+# IUSE+=" neon"    ## Not tested yet
+# IUSE+=" altivec" ## Not tested yet
+IUSE+=" mmx 3dnow sse sse2 sse3 ssse3 sse4_1 sse4_2 avx"
+
+
 DEPEND="virtual/pkgconfig"
 if [[ ${QT4_BUILD_TYPE} == live ]]; then
        DEPEND+=" dev-lang/perl"
@@ -469,6 +476,18 @@ qt4-build_src_configure() {
                conf+=" $(pkg-config --cflags-only-I freetype2)"
        fi
 
+       if ! use cpudetection; then
+               use mmx    || conf+=" -no-mmx"
+               use 3dnow  || conf+=" -no-3dnow"
+               use sse    || conf+=" -no-sse"
+               use sse2   || conf+=" -no-sse2"
+               use sse3   || conf+=" -no-sse3"
+               use ssse3  || conf+=" -no-ssse3"
+               use sse4_1 || conf+=" -no-sse4.1"
+               use sse4_2 || conf+=" -no-sse4.2"
+               use avx    || conf+=" -no-avx"
+       fi
+       
        conf+=" ${myconf}"
        myconf=