diff --git a/Makefile.x86_64 b/Makefile.x86_64
index 43bfc9ecd..365ccdcfd 100644
--- a/Makefile.x86_64
+++ b/Makefile.x86_64
@@ -24,14 +24,19 @@ ifdef HAVE_AVX
 CCOMMON_OPT += -mavx
 FCOMMON_OPT += -mavx
 endif
+ifndef NO_AVX2
 ifdef HAVE_AVX2
 CCOMMON_OPT += -mavx2
 FCOMMON_OPT += -mavx2
 endif
+endif
+ifndef NO_FMA
 ifdef HAVE_FMA3
 CCOMMON_OPT += -mfma
 FCOMMON_OPT += -mfma
 endif
+endif
+
 
 ifeq ($(CORE), SKYLAKEX)
 ifndef DYNAMIC_ARCH