diff --git a/make-linux.mk b/make-linux.mk
index 94bbe0dbb..48d44a048 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -357,6 +357,9 @@ endif
 override CFLAGS+=-fPIC -fPIE
 override CXXFLAGS+=-fPIC -fPIE
 
+# Non-executable stack
+override ASFLAGS+=--noexecstack
+
 .PHONY: all
 all:	one