diff --git a/etc/defaults.conf b/etc/defaults.conf
index 9412182d213..491d1da8e55 100644
--- a/etc/defaults.conf
+++ b/etc/defaults.conf
@@ -49,7 +49,7 @@ XBPS_INSTALL_ARGS="--repository=http://repo.voidlinux.eu/current"
 # [OPTIONAL]
 # Compilation flags for C and C++.
 #
-XBPS_CFLAGS="-O2 -pipe"
+XBPS_CFLAGS="-O2 -pipe -mtune=generic -fstack-protector-strong"
 XBPS_CXXFLAGS="${XBPS_CFLAGS}"
 
 # [OPTIONAL]
@@ -90,7 +90,7 @@ XBPS_SUCMD="sudo /bin/sh -c"
 #XBPS_USE_GIT_REVS=yes
 
 # [OPTIONAL]
-# Disable building -dbg subpackages with debugging symbols. Please note
+# Enable building -dbg subpackages with debugging symbols. Please note
 # that building with debugging symbols make take a long while in some
 # packages even on computers with a fast CPU; as well as needs lots of
 # RAM to build properly some packages.