diff --git a/etc/makepkg.conf b/etc/makepkg.conf
index c721f3c..c557996 100644
--- a/etc/makepkg.conf
+++ b/etc/makepkg.conf
@@ -40,7 +40,7 @@ CHOST="x86_64-pc-linux-gnu"
 
 #-- Compiler and Linker Flags
 #CPPFLAGS=""
-CFLAGS="-march=native -O2 -pipe -fno-plt -fexceptions \
+CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
         -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection \
         -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
@@ -48,7 +48,7 @@ CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
          -Wl,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
-RUSTFLAGS="-C opt-level=2 -Cforce-frame-pointers=yes -C target-cpu=native"
+RUSTFLAGS="-C opt-level=2 -Cforce-frame-pointers=yes"
 #-- Make Flags: change this for DistCC/SMP systems
 MAKEFLAGS="-j$(nproc)"
 #-- Debugging flags