diff --git a/frr/Makefile b/frr/Makefile
index 8b815fbdf4e..9c57423299a 100644
--- a/frr/Makefile
+++ b/frr/Makefile
@@ -24,6 +24,11 @@ BUILD_DEFS=		VARBASE
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+# to pick up the atomic implementation on i386
+.if ${MACHINE_ARCH} == "i386"
+CPPFLAGS+=      -march=i586
+.endif
+
 FRR_GROUP?=	_frr
 FRR_VTY_GROUP?=	frrvty