diff --git a/configs b/configs
index 996df29a34c..11b777b1b54 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 996df29a34c1c6034871c6ebdfe0c480ff68b8f8
+Subproject commit 11b777b1b549c662a23d87b8a5321ed9fea9c34a
diff --git a/tools/mkconfig.c b/tools/mkconfig.c
index 93dc7e31491..db93b709d7f 100644
--- a/tools/mkconfig.c
+++ b/tools/mkconfig.c
@@ -209,8 +209,12 @@ int main(int argc, char **argv, char **envp)
   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("#ifndef CONFIG_MQ_MAXMSGSIZE)\n");
+  printf("# define CONFIG_DISABLE_MQUEUE 0\n");
+  printf("#endif\n\n");
   printf("#if CONFIG_MQ_MAXMSGSIZE <= 0 && !defined(CONFIG_DISABLE_MQUEUE)\n");
-  printf("# define CONFIG_DISABLE_MQUEUE 1\n");
+  printf("# undef CONFIG_DISABLE_MQUEUE\n");
+  printf("# define CONFIG_DISABLE_MQUEUE 0\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");