diff --git a/Makefile.tool.am b/Makefile.tool.am
index d7198825e..5af3023d9 100644
--- a/Makefile.tool.am
+++ b/Makefile.tool.am
@@ -37,7 +37,8 @@ TOOL_LDFLAGS_COMMON_LINUX = \
 TOOL_LDFLAGS_COMMON_DARWIN = \
 	-nodefaultlibs -nostartfiles -Wl,-u,__start -Wl,-e,__start
 TOOL_LDFLAGS_COMMON_SOLARIS = \
-	-static -nodefaultlibs -nostartfiles -u _start
+	-static -nodefaultlibs -nostartfiles -u _start \
+	-Wl,-M,/usr/lib/ld/map.noexstk
 
 TOOL_LDFLAGS_X86_LINUX = \
 	$(TOOL_LDFLAGS_COMMON_LINUX) @FLAG_M32@
diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 7f25f489d..d29f9549e 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -66,6 +66,9 @@ if VGCONF_PLATVARIANT_IS_ANDROID
 valgrind_CFLAGS += -static
 valgrind_LDFLAGS   += -Wl,-z,noexecstack
 endif
+if VGCONF_OS_IS_SOLARIS
+valgrind_LDFLAGS   += -Wl,-M,/usr/lib/ld/map.noexstk
+endif
 
 
 vgdb_SOURCES = vgdb.c