diff --git a/compel/plugins/Makefile b/compel/plugins/Makefile
index 09587d1e0..ac54f7c2e 100644
--- a/compel/plugins/Makefile
+++ b/compel/plugins/Makefile
@@ -22,9 +22,10 @@ asflags-y		+= -iquote $(PLUGIN_ARCH_DIR)/include
 asflags-y		+= -iquote $(PLUGIN_ARCH_DIR)
 
 # General flags for assembly
-asflags-y		+= -fpie -Wstrict-prototypes -Wa,--noexecstack
+asflags-y		+= -fpie -Wstrict-prototypes
 asflags-y		+= -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer
 asflags-y		+= -fno-stack-protector
+ldflags-y		+= -z noexecstack
 
 #
 # Fds plugin
diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index 3b5380194..1b408d14c 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -1,7 +1,8 @@
 target			:= native
 
 CFLAGS			:= $(filter-out -DCONFIG_X86_64,$(CFLAGS))
-CFLAGS			+= -Wa,--noexecstack -fno-stack-protector -DCR_NOGLIBC
+CFLAGS			+= -fno-stack-protector -DCR_NOGLIBC
+LDFLAGS			+= -z noexecstack
 
 CFLAGS_native		+= -fpie
 
diff --git a/lib/c/Makefile b/lib/c/Makefile
index 21bf85614..68cf2b9ce 100644
--- a/lib/c/Makefile
+++ b/lib/c/Makefile
@@ -4,4 +4,5 @@ obj-y			+= $(SRC_DIR)/images/rpc.pb-c.o
 ccflags-y		+= -iquote $(SRC_DIR)/criu/$(ARCH_DIR)/include
 ccflags-y		+= -iquote $(SRC_DIR)/criu/include -iquote $(obj)/..
 ccflags-y		+= -iquote $(SRC_DIR)/images
-ccflags-y		+= -fPIC -Wa,--noexecstack -fno-stack-protector
+ccflags-y		+= -fPIC -fno-stack-protector
+ldflags-y		+= -z noexecstack