diff --git a/tools/mkconfig.c b/tools/mkconfig.c
index 3a9eda8a45..efaa29a21c 100644
--- a/tools/mkconfig.c
+++ b/tools/mkconfig.c
@@ -288,6 +288,12 @@ int main(int argc, char **argv, char **envp)
   printf("# undef CONFIG_STDIO_BUFFER_SIZE\n");
   printf("# define CONFIG_STDIO_BUFFER_SIZE 0\n");
   printf("#endif\n\n");
+  printf("/* If the maximum message size is zero, then we assume that message queues\n");
+  printf(" * support should be disabled\n");
+  printf(" */\n\n");
+  printf("#if CONFIG_MQ_MAXMSGSIZE <= 0 && !defined(CONFIG_DISABLE_MQUEUE)\n");
+  printf("# define CONFIG_DISABLE_MQUEUE 1\n");
+  printf("#endif\n\n");
   printf("/* If mountpoint support in not included, then no filesystem can be supported */\n\n");
   printf("#ifdef CONFIG_DISABLE_MOUNTPOINT\n");
   printf("# undef CONFIG_FS_FAT\n");