diff --git a/apps/app_celgenuserevent.c b/apps/app_celgenuserevent.c
index b1701ba23e..57dde86dea 100644
--- a/apps/app_celgenuserevent.c
+++ b/apps/app_celgenuserevent.c
@@ -23,6 +23,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_system.c b/apps/app_system.c
index b5fee94b5f..7fe453de13 100644
--- a/apps/app_system.c
+++ b/apps/app_system.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/build_tools/cflags.xml b/build_tools/cflags.xml
index 2bd8fd2f2e..eabb02951a 100644
--- a/build_tools/cflags.xml
+++ b/build_tools/cflags.xml
@@ -1,15 +1,19 @@
 	<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean">
 		<member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler">
+			<support_level>core</support_level>
 		</member>
 		<member name="DEBUG_THREADS" displayname="Enable Thread Debugging">
+			<support_level>core</support_level>
 		</member>
 		<member name="STATIC_BUILD" displayname="Build static binaries">
 			<support_level>extended</support_level>
 		</member>
 		<member name="LOADABLE_MODULES" displayname="Runtime module loading">
+			<support_level>core</support_level>
 			<defaultenabled>yes</defaultenabled>
 		</member>
 		<member name="DEBUG_FD_LEAKS" displayname="Enable File Descriptor Leak Detection">
+			<support_level>core</support_level>
 		</member>
 		<member name="REBUILD_PARSERS" displayname="Rebuild AEL and expression parsers from bison/flex source files">
 			<depend>bison</depend>
@@ -32,6 +36,7 @@
 			<support_level>extended</support_level>
 		</member>
 		<member name="LOTS_OF_SPANS" displayname="More than 32 DAHDI spans">
+			<support_level>core</support_level>
 		</member>
 		<member name="RADIO_RELAX" displayname="Relax DTMF for Radio Applications">
 			<support_level>extended</support_level>
@@ -53,6 +58,7 @@
 			<support_level>extended</support_level>
 		</member>
 		<member name="MALLOC_DEBUG" displayname="Keep Track of Memory Allocations">
+			<support_level>core</support_level>
 		</member>
 		<member name="BUSYDETECT_TONEONLY" displayname="Enable additional comparision of only the tone duration not the silence part">
 			<conflict>BUSYDETECT_COMPARE_TONE_AND_SILENCE</conflict>
diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c
index 9e15d40953..2fb2a2c430 100644
--- a/codecs/codec_dahdi.c
+++ b/codecs/codec_dahdi.c
@@ -27,6 +27,7 @@
  */
 
 /*** MODULEINFO
+	<support_level>core</support_level>
 	<depend>dahdi</depend>
  ***/
 
diff --git a/funcs/func_realtime.c b/funcs/func_realtime.c
index d8251f4c6a..a49077c8b7 100644
--- a/funcs/func_realtime.c
+++ b/funcs/func_realtime.c
@@ -15,6 +15,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 /*! \file
  *
  * \brief REALTIME dialplan function
diff --git a/res/res_curl.c b/res/res_curl.c
index 411c06e11b..73e1e5c365 100644
--- a/res/res_curl.c
+++ b/res/res_curl.c
@@ -27,6 +27,7 @@
  */
 
 /*** MODULEINFO
+	<support_level>core</support_level>
 	<depend>curl</depend>
  ***/
 
diff --git a/res/res_fax.c b/res/res_fax.c
index 0cd3911442..6b9d7dff3d 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -35,6 +35,7 @@
  */
 
 /*** MODULEINFO
+	<support_level>core</support_level>
 	<conflict>app_fax</conflict>
 ***/
 
@@ -46,17 +47,13 @@
  * \author Kevin P. Fleming <kpfleming@digium.com>
  * \author Matthew Nicholson <mnicholson@digium.com>
  * \author Gregory H. Nietsky  <gregory@distrotech.co.za>
- * 
+ *
  * A generic FAX resource module that provides SendFAX and ReceiveFAX applications.
  * This module requires FAX technology modules, like res_fax_spandsp, to register with it
  * so it can use the technology modules to perform the actual FAX transmissions.
  * \ingroup applications
  */
 
-/*** MODULEINFO
-	<support_level>core</support_level>
- ***/
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/utils/utils.xml b/utils/utils.xml
index 733bd535e0..de1cadc8ac 100644
--- a/utils/utils.xml
+++ b/utils/utils.xml
@@ -5,6 +5,7 @@
   </member>
   <member name="astcanary">
 	<defaultenabled>yes</defaultenabled>
+	<support_level>core</support_level>
   </member>
   <member name="astdb2sqlite3">
 	<defaultenabled>yes</defaultenabled>