diff --git a/include/linux/personality.h b/include/linux/personality.h
index a84e9ff9b27e..b7f578dac544 100644
--- a/include/linux/personality.h
+++ b/include/linux/personality.h
@@ -40,7 +40,11 @@ enum {
  * Security-relevant compatibility flags that must be
  * cleared upon setuid or setgid exec:
  */
-#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC|ADDR_NO_RANDOMIZE)
+#define PER_CLEAR_ON_SETID \
+	(READ_IMPLIES_EXEC | \
+	 ADDR_NO_RANDOMIZE | \
+	 ADDR_COMPAT_LAYOUT | \
+	 MMAP_PAGE_ZERO)
 
 /*
  * Personality types.