diff --git a/roles/desktop/files/portage/make.conf b/roles/desktop/files/portage/make.conf
index cbdd1cf..aaed60a 100644
--- a/roles/desktop/files/portage/make.conf
+++ b/roles/desktop/files/portage/make.conf
@@ -15,7 +15,8 @@ USE="curl ffmpeg gnome-keyring gstreamer networkmanager opus pulseaudio systemd
 # ABI_X86 is used to control multilib support
 ABI_X86="64 32"
 COMMON_FLAGS="-march=native -O2 -pipe"
-CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3"
+CPU_FLAGS_X86="$(cpuid2cpuflags)"
+#CPU_FLAGS_X86="aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt rdrand sha sse sse2 sse3 sse4_1 sse4_2 sse4a ssse3"
 CFLAGS="${COMMON_FLAGS}"
 CXXFLAGS="${COMMON_FLAGS}"
 MAKEOPTS="-j16"