diff --git a/addons/app_mysql.c b/addons/app_mysql.c
index 589b238237c1c88a57329bf641f62fcf4be8d972..5649166a72b6b4aa07687b3f399ed2c7482eb20b 100644
--- a/addons/app_mysql.c
+++ b/addons/app_mysql.c
@@ -26,6 +26,8 @@
 /*** MODULEINFO
 	<depend>mysqlclient</depend>
 	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>func_odbc</replacement>
  ***/
 
 #include "asterisk.h"
diff --git a/addons/app_saycountpl.c b/addons/app_saycountpl.c
index 9157798996da5adf22084889a0f6091799da25a4..b4441f24ff6d11496c467b6b60f4a9c901203ca7 100644
--- a/addons/app_saycountpl.c
+++ b/addons/app_saycountpl.c
@@ -22,6 +22,8 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>say.conf</replacement>
  ***/
 
 #include "asterisk.h"
diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index 60abae2d95af54a9cfafcc7584b9275207031e1c..ecdfaea0bd114714988cfb105d637b86e8a9a74e 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -36,6 +36,8 @@
 /*** MODULEINFO
 	<depend>mysqlclient</depend>
 	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>cdr_adaptive_odbc</replacement>
  ***/
 
 #include "asterisk.h"
diff --git a/addons/chan_mobile.c b/addons/chan_mobile.c
index 5495c7f2272216888a2d099bd089fa7c329192ad..7c14927298e46045ea23721b3cc9748fe1732ec5 100644
--- a/addons/chan_mobile.c
+++ b/addons/chan_mobile.c
@@ -28,6 +28,7 @@
 /*** MODULEINFO
 	<depend>bluetooth</depend>
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 552b8f22cc47382619657c9ceb172c9eda1e07c5..32d1cf7d4f478ae08f7e6c7b1eb005ec44808da9 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -19,6 +19,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "chan_ooh323.h"
diff --git a/addons/format_mp3.c b/addons/format_mp3.c
index d59411d6cbea696b0ebdf57c1a408bf461598368..5584f3e0610768286fb997ded1c6c74838330560 100644
--- a/addons/format_mp3.c
+++ b/addons/format_mp3.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
index eaf7209f93c8c130d640b039f5ea588825e41aa3..d393de6c164ce7e11f1bee06b8930aabe60ed3a0 100644
--- a/addons/res_config_mysql.c
+++ b/addons/res_config_mysql.c
@@ -25,6 +25,7 @@
 /*** MODULEINFO
 	<depend>mysqlclient</depend>
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/agi/eagi-test.c b/agi/eagi-test.c
index dc2d7fa1ab14720e678c7b74cd91993e2fa63d8a..7f24d1f23ddbc1c6b763c4ccdcee780fb5d1d768 100644
--- a/agi/eagi-test.c
+++ b/agi/eagi-test.c
@@ -5,6 +5,10 @@
  * with no warranty of any kind
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #define AUDIO_FILENO (STDERR_FILENO + 1)
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index c138f04296291cc20664a7c5c5e1588d726cd5cd..430d8258d600222d81dbd964d1257d0a4e8e75b1 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>res_adsi</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 6936cb5a0d5ad7bd468c6cb78ff089aaf3054899..1a4f9220fab983a914130e5a38bfde45bb06514c 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -29,6 +29,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_amd.c b/apps/app_amd.c
index 7c4e2a47a8094f8645f881abac38f5a5381314d3..35c5005f7d70a937cc2bbdd306a324dfed5446a9 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -26,6 +26,9 @@
  * \author Claude Klimos (claude.klimos@aheeva.com)
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
 
 #include "asterisk.h"
 
diff --git a/apps/app_authenticate.c b/apps/app_authenticate.c
index 416ea432d627a25b3f0aa00fa9a28164b6ed7131..8b5fa11a628f3c20159a707453cd2edee835bdec 100644
--- a/apps/app_authenticate.c
+++ b/apps/app_authenticate.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_cdr.c b/apps/app_cdr.c
index 70036ad825d650d080819668ea366e764ec38f7e..2f227b0490bff2a5e4d8bd89ad4ee134646768bd 100644
--- a/apps/app_cdr.c
+++ b/apps/app_cdr.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_chanisavail.c b/apps/app_chanisavail.c
index 5dd4a1f60353d0aa18414ca71d70eb5ef9be71a7..86ce34177b2fbb479be785f24f425a8abc5f3184 100644
--- a/apps/app_chanisavail.c
+++ b/apps/app_chanisavail.c
@@ -27,6 +27,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_channelredirect.c b/apps/app_channelredirect.c
index 57c9234ef3581af546489dc64ea734838cbbfb1a..8fe543dab1fc62d2fac61027a07463dbcc1bd459 100644
--- a/apps/app_channelredirect.c
+++ b/apps/app_channelredirect.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_chanspy.c b/apps/app_chanspy.c
index c90a7907a478263b9170aac1fc02d32c3e08fb2a..92e0ba5130f2049aaaff71e18edddd50905defd9 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -29,6 +29,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index 0ca2c6e8dd777218246072329243b1938b29e830..4897d065ebd80d97f91cfb5a17202cc97f5760ca 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -28,6 +28,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index bbeea303766dde536c52c98ea15641b2cc4e248e..1e2e6fbc20f31dee31bcfac8dcb6ac445b79e9bd 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_dahdibarge.c b/apps/app_dahdibarge.c
index 082405e80ec7cb502d449116db34491977b9e52e..bb0120cbc866a1bdb5044c6be9dba03710ee64be 100644
--- a/apps/app_dahdibarge.c
+++ b/apps/app_dahdibarge.c
@@ -33,6 +33,9 @@
 
 /*** MODULEINFO
 	<depend>dahdi</depend>
+	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>app_chanspy</replacement>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_dahdiras.c b/apps/app_dahdiras.c
index b467b16b8b5ca654bf9bb1b7a1d8902a1c7f3784..fbaf984505347201e95975c1bc76273583db840f 100644
--- a/apps/app_dahdiras.c
+++ b/apps/app_dahdiras.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>dahdi</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_db.c b/apps/app_db.c
index 99679e71b022014783d8beb4528d6692d2ce0aaf..1fa24088e0dc235da1f7b639177d8e93b201befe 100644
--- a/apps/app_db.c
+++ b/apps/app_db.c
@@ -28,6 +28,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_dial.c b/apps/app_dial.c
index d3b8009de60bd07d86478012ded1283be139a74b..f144d48ea29cff3675c833c760b6fe64ee2b0974 100644
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>chan_local</depend>
+	<support_level>core</support_level>
  ***/
 
 
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 5bf439d1609b923fde876b584fd4e022d3d6e0cb..b50fbb044841399205d185622dd71d0d3e64fe3a 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -27,6 +27,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_directed_pickup.c b/apps/app_directed_pickup.c
index 63a7621ff8ec5ea45a1b368f779aa8f6f812293d..c2bdf513186b19077f5035dffb20b022b09e5205 100644
--- a/apps/app_directed_pickup.c
+++ b/apps/app_directed_pickup.c
@@ -29,6 +29,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_directory.c b/apps/app_directory.c
index 8451eea083985b05b593450aca08c4b73e83b656..dccae948b97ef7d80f243476376484ad017210e9 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>app_voicemail</depend>
+	<support_level>core</support_level>
  ***/
 #include "asterisk.h"
 
diff --git a/apps/app_disa.c b/apps/app_disa.c
index 20c9ce48cabda9f118dc5e94b38bc0e4e5e26d3d..3ca08000963771d674f643fed443f2206e9cd6d5 100644
--- a/apps/app_disa.c
+++ b/apps/app_disa.c
@@ -26,6 +26,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_dumpchan.c b/apps/app_dumpchan.c
index f9e6572014b43e32991c891f52b0a5ab341eba92..0a9fa6888769fa2750d1eb318d3ce44b65a7dc0f 100644
--- a/apps/app_dumpchan.c
+++ b/apps/app_dumpchan.c
@@ -28,6 +28,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_echo.c b/apps/app_echo.c
index ab991427ddc3c8b5e9f9ccd4430100e8fdede206..48e6714e211b6d82cf3ed57480181db3ed41eb45 100644
--- a/apps/app_echo.c
+++ b/apps/app_echo.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_exec.c b/apps/app_exec.c
index 2a4da1e2f2410d2cdc44e0b19c9a8e93c736e769..ab9a9aecefe63851aeebb78a9d1e916897d213c9 100644
--- a/apps/app_exec.c
+++ b/apps/app_exec.c
@@ -26,6 +26,9 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index 258a1e5c75aeb9c31897a36178b106b6ad7480c2..4eb99c1bbeb842498028de7accdf13e894af7626 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -31,6 +31,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_fax.c b/apps/app_fax.c
index 0d59dfa3a3658c215174a179b056c92b2ae4e623..e2085cbbb18a96406774adda7cb932258a9bc4ba 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -16,6 +16,7 @@
 	<defaultenabled>no</defaultenabled>
 	<depend>spandsp</depend>
 	<conflict>res_fax</conflict>
+	<support_level>extended</support_level>
 ***/
 
 #include "asterisk.h"
diff --git a/apps/app_festival.c b/apps/app_festival.c
index a30302fa7b655e48eca524e3591c589a3bf5763a..d609b3fe45761d116474cfb1a1f9edb76e04495b 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -27,6 +27,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_flash.c b/apps/app_flash.c
index dedadfeabb79c1002438b3a038866c191669466a..3273b5b0a101b38856114ad466b966012a0a8fd2 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -27,6 +27,7 @@
  
 /*** MODULEINFO
 	<depend>dahdi</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 7ed8749286eb03a04e0faa7042bb710a22773b7b..a72ef307a56dd5e73c734c30280464e47a1610b5 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -30,6 +30,7 @@
 
 /*** MODULEINFO
 	<depend>chan_local</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_forkcdr.c b/apps/app_forkcdr.c
index 12d5049140c8e9a3fffacba7a70ff3d663e2a9b2..ffeeca8ece52e86f66fa5d90a9416a19c7fe7a86 100644
--- a/apps/app_forkcdr.c
+++ b/apps/app_forkcdr.c
@@ -26,6 +26,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index 2207081568375fa6509b5bdc93fa5643b5c4d853..7f59976eb23c25ca2a13d292be6b42967d5512dc 100644
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_ices.c b/apps/app_ices.c
index 7293753131f98e0ae8ee2994a0558865e2903918..52c03ae09ead43bd090babeb5fcffe9a4b15e2f1 100644
--- a/apps/app_ices.c
+++ b/apps/app_ices.c
@@ -26,6 +26,10 @@
  *
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/apps/app_image.c b/apps/app_image.c
index af4abd7e9801f18b14044c5e84b89457175c74ef..160a28569701155aa89d8c3a062724cd8de6c5a8 100644
--- a/apps/app_image.c
+++ b/apps/app_image.c
@@ -24,6 +24,10 @@
  * 
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/apps/app_ivrdemo.c b/apps/app_ivrdemo.c
index a9c61209ac3cfea5f280df35614783f8592b99ba..d035df91f9318c754eba4de8e9b1a752607335d0 100644
--- a/apps/app_ivrdemo.c
+++ b/apps/app_ivrdemo.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_jack.c b/apps/app_jack.c
index 07ab8da7938629305ff9672dab7877cdd8316069..893a5dec0a897a0320c48456b60a965ebe487eda 100644
--- a/apps/app_jack.c
+++ b/apps/app_jack.c
@@ -37,6 +37,7 @@
 /*** MODULEINFO
 	<depend>jack</depend>
 	<depend>resample</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_macro.c b/apps/app_macro.c
index aecc0327eb22867de200ff6ba9e462e52367f7df..3bbfe20d6b31020a09b63a68d3db19cde9c013ef 100644
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -25,6 +25,12 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>app_stack (GoSub)</replacement>
+ */
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 40f5b0ee44255a57a5df4deb95183e7795e19e2c..73aaefc0e696b9c3624177ced4377a2ff7243c80 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -31,6 +31,9 @@
 
 /*** MODULEINFO
 	<depend>dahdi</depend>
+	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>app_confbridge</replacement>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_milliwatt.c b/apps/app_milliwatt.c
index 26cba3c40f0e101c8b3f580015b8cc3e22c15afd..dc37e7e896a7ea39cb91bb20e3c48c8fc40ba962 100644
--- a/apps/app_milliwatt.c
+++ b/apps/app_milliwatt.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_minivm.c b/apps/app_minivm.c
index 124a04d4f743c6478c9a41595b75a195de064c35..3445b7ec6b7eef0175875a88f8a9f3d7fa1e3269 100644
--- a/apps/app_minivm.c
+++ b/apps/app_minivm.c
@@ -141,6 +141,10 @@
  * Back: \ref App_minivm
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_mixmonitor.c b/apps/app_mixmonitor.c
index 05798ffa33d009fa6b6c3ee93a88f09704516cc4..c263b144515339b1ed8bfd7511ea6416f5e25bb5 100644
--- a/apps/app_mixmonitor.c
+++ b/apps/app_mixmonitor.c
@@ -33,6 +33,10 @@
  * Anthony Minessale II <anthmct@yahoo.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_morsecode.c b/apps/app_morsecode.c
index a234cd431b8169916a448f20da3252e4d72c5282..67e242f7be639c6e1466a7a8ee53c315e6855591 100644
--- a/apps/app_morsecode.c
+++ b/apps/app_morsecode.c
@@ -24,6 +24,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_mp3.c b/apps/app_mp3.c
index f8c5a05781f98b8230d30461c29269ac78a02390..922d42a5b4dadba264dc8c6cf00f16d01f8346ad 100644
--- a/apps/app_mp3.c
+++ b/apps/app_mp3.c
@@ -27,6 +27,10 @@
  * 
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/apps/app_nbscat.c b/apps/app_nbscat.c
index 2bbde630e1060879e1d207a54370c521b5becb05..0936534953ced54cae8079ed41dd73d59de991ff 100644
--- a/apps/app_nbscat.c
+++ b/apps/app_nbscat.c
@@ -24,6 +24,10 @@
  *  
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/apps/app_originate.c b/apps/app_originate.c
index bc811d958b0377880f6dce17532ce3e435355314..5cfd41386763dec0ec84c56bec48ebc9855b8539 100644
--- a/apps/app_originate.c
+++ b/apps/app_originate.c
@@ -32,6 +32,10 @@
  *       Set options for call files.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index 239d6d501d51b73e007c603d1824736ef455d9d4..9dbf39752a4769b07d45a801e7d1eee03dcdb2bb 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -31,6 +31,7 @@
 /*** MODULEINFO
 	<depend>osptk</depend>
 	<depend>openssl</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_page.c b/apps/app_page.c
index 656dcf57153742fe08e56c9fb2498aeaa684c5e4..cf2101446774cdc27e8ff6efcb595b1b3ab74eb9 100644
--- a/apps/app_page.c
+++ b/apps/app_page.c
@@ -28,6 +28,7 @@
 /*** MODULEINFO
 	<depend>dahdi</depend>
 	<depend>app_meetme</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_parkandannounce.c b/apps/app_parkandannounce.c
index fb3e713e13bd558c8e75e46470ebd691678cc495..70633745bc6bc081e33f4b022454df6289fc7eb1 100644
--- a/apps/app_parkandannounce.c
+++ b/apps/app_parkandannounce.c
@@ -29,6 +29,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_playback.c b/apps/app_playback.c
index 1e198470e635fbf4bb68abaec08f06c3705400b0..ea4d90b19da1fac0c56f3a78c83abb1d63efd884 100644
--- a/apps/app_playback.c
+++ b/apps/app_playback.c
@@ -24,7 +24,11 @@
  * 
  * \ingroup applications
  */
- 
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_playtones.c b/apps/app_playtones.c
index c9c0fbb99ae8ec3667ccf2bb303fa08baead5644..1e142de2322c8ee8cd3beb01e483b27b894ebc9d 100644
--- a/apps/app_playtones.c
+++ b/apps/app_playtones.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 6a6c1a437812fa46da4dddaf3803a190a268059c..6b191771c8eea61167ddef3ba1a1b506c0a8aba1 100644
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 9442ce6495e5f5d55c2c49c6e187ce2ba7b8a9a7..fdb36fed1d5d9e1aaca160e54f35953c0045c001 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -58,6 +58,7 @@
 
 /*** MODULEINFO
 	<use type="module">res_monitor</use>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_read.c b/apps/app_read.c
index a5e4a64342d501974ec6e36faa6f8262e5719f47..813d3756541e08531d866ddeae0baf0371f46add 100644
--- a/apps/app_read.c
+++ b/apps/app_read.c
@@ -24,6 +24,10 @@
  * 
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/apps/app_readexten.c b/apps/app_readexten.c
index 5e8159b359b7b743071a04596069e142af7d58fa..94dc1e1f87f3fd28416eeac285cd0c12414878d7 100644
--- a/apps/app_readexten.c
+++ b/apps/app_readexten.c
@@ -23,6 +23,10 @@
  * 
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/apps/app_readfile.c b/apps/app_readfile.c
index 8c3bcae64d50e9d33af63cf15e9445c6cdc4e6a3..d031406c205f36dc26e8a2d410cbb39dd18f4476 100644
--- a/apps/app_readfile.c
+++ b/apps/app_readfile.c
@@ -25,6 +25,12 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>func_env (FILE())</replacement>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_record.c b/apps/app_record.c
index a192b1adc1fd46191b6fb7bab64c0d8022f864e7..6098ca7290ca3007be3e2fae66c80a28ceccba3d 100644
--- a/apps/app_record.c
+++ b/apps/app_record.c
@@ -24,6 +24,10 @@
  *
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index 990f05423feff81d341b26e83922e3f0bb6608a6..f37083695a08cd740b4cfef979c9fdcf2473ff4a 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -155,6 +155,7 @@
 	<depend>dahdi</depend>
 	<depend>tonezone</depend>
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 /* Un-comment the following to include support for MDC-1200 digital tone
diff --git a/apps/app_saycounted.c b/apps/app_saycounted.c
index c840d8bb0d006c546c8b31b8fb19d763c7daf84f..be3ac65ef115a04644af61460e565988df6e358a 100644
--- a/apps/app_saycounted.c
+++ b/apps/app_saycounted.c
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 /*** DOCUMENTATION
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c
index 55afdf4638094a30d6c75f893b968e90d6f34e9c..fc1b238dd84bb022c3da773c67a4280248f497e7 100644
--- a/apps/app_sayunixtime.c
+++ b/apps/app_sayunixtime.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index 2af67a299a1e69a7f755ce88c8461dc2ddb72f5b..5c8425a0f3428df93bc33c6d66f2b992bcc6bfd0 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -24,6 +24,10 @@
  * 
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/apps/app_sendtext.c b/apps/app_sendtext.c
index 2624fe505b4e05c72bab48deec5af09b147d6e33..a723de5b9eda9dd3dcf96c1c3e1d23e74c5b25e7 100644
--- a/apps/app_sendtext.c
+++ b/apps/app_sendtext.c
@@ -26,6 +26,10 @@
  *
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c
index 666e46ff4e57fa0792294784256ced123c280a3c..cfcd2b47de7e5db697be5e68b530efd7e105ae32 100644
--- a/apps/app_setcallerid.c
+++ b/apps/app_setcallerid.c
@@ -24,7 +24,13 @@
  * 
  * \ingroup applications
  */
- 
+
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>func_callerid</replacement>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_skel.c b/apps/app_skel.c
index c58d451e406df62eb7df802e60e1c0df1e104b71..bd3b546e00c00da72fc15dd749280b2370bde9b8 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -31,6 +31,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_sms.c b/apps/app_sms.c
index 07af71d1cd0b69ce707391a68582d27496893bc4..e3f8c5260bca9a948a07f94310905ef48f385c38 100644
--- a/apps/app_sms.c
+++ b/apps/app_sms.c
@@ -34,6 +34,10 @@
  *		   Not fully tested, under development
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_softhangup.c b/apps/app_softhangup.c
index 1c880b4e8b260de2c0278bed7383e7f4ae48f84b..cdfd7c147de168534b6db8ec91d01f23c41311b5 100644
--- a/apps/app_softhangup.c
+++ b/apps/app_softhangup.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index fe99157e95ae66a5f5989170e843c48e3dc42d5d..637aac613a6fb792c7ac2c84afbe9ff1682949bf 100644
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
diff --git a/apps/app_stack.c b/apps/app_stack.c
index 10a1af48d160416f5e6aa58ea86fd1da9722474f..c5f0b6affb6d86f7b4e4dd58244acf121ecd425d 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<use type="module">res_agi</use>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/apps/app_talkdetect.c b/apps/app_talkdetect.c
index 545261c72f2b30d59889fdeb6aff263291d2563f..9eb800287a2f449d39213fb3b57639e6e22c3665 100644
--- a/apps/app_talkdetect.c
+++ b/apps/app_talkdetect.c
@@ -24,7 +24,11 @@
  * 
  * \ingroup applications
  */
- 
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_test.c b/apps/app_test.c
index 7d0214a59a28d26d611566e3de4b2795a2a72046..32b6fc02b6b43396736ad4ffc773565ace6eb82f 100644
--- a/apps/app_test.c
+++ b/apps/app_test.c
@@ -27,6 +27,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_transfer.c b/apps/app_transfer.c
index ad6e8011e9c22e2e73f0976b75ebe471d20d2a56..f072eb27f534b6523a531400f54da4eea65977be 100644
--- a/apps/app_transfer.c
+++ b/apps/app_transfer.c
@@ -27,6 +27,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_url.c b/apps/app_url.c
index 533c11212bbc4c0eacf72732fbc3ca4cfef79226..f33890c76af46e3d35ea2a2af6b01789c32998a3 100644
--- a/apps/app_url.c
+++ b/apps/app_url.c
@@ -24,6 +24,10 @@
  * 
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/apps/app_userevent.c b/apps/app_userevent.c
index 1e1e4a9cd1483ee136a3fe89885775b223c114e2..59bea65df697ec2bcb30bc14e37031df1d2a5d50 100644
--- a/apps/app_userevent.c
+++ b/apps/app_userevent.c
@@ -21,6 +21,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_verbose.c b/apps/app_verbose.c
index 85f79f892da2f76886cdcc888f565bd2fe4e8400..ca1a010cc33671377fe1e47d30454d594b8acc30 100644
--- a/apps/app_verbose.c
+++ b/apps/app_verbose.c
@@ -24,6 +24,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 1f72ee1d974606b133aa05ce4b810f39e2681281..764a445206934daf82d3a1ced5ddd43b928390dc 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -40,6 +40,7 @@
 /*** MODULEINFO
 	<use type="module">res_adsi</use>
 	<use type="module">res_smdi</use>
+	<support_level>core</support_level>
  ***/
 
 /*** MAKEOPTS
diff --git a/apps/app_waitforring.c b/apps/app_waitforring.c
index 7ddc9db12b6cd62cd714718b5e9fddee58cdb725..bd0353b074d15da07e0ea47ccd1f9e57b49f7b39 100644
--- a/apps/app_waitforring.c
+++ b/apps/app_waitforring.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_waitforsilence.c b/apps/app_waitforsilence.c
index fe4b1e14dca41b57e6118c19273b294e77e642fd..a920e11a866197b9036d4fa86980c4ac7c891051 100644
--- a/apps/app_waitforsilence.c
+++ b/apps/app_waitforsilence.c
@@ -38,6 +38,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_waituntil.c b/apps/app_waituntil.c
index 04905edc510c0a5834075135b566464085479f21..d1f4bb103a2b346c7f2e9d34fa09f74f12275538 100644
--- a/apps/app_waituntil.c
+++ b/apps/app_waituntil.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_while.c b/apps/app_while.c
index 80359359e19b9871239a47a493822efd3a214455..45bd65594412f652d00c0e7dc04162528019a5cd 100644
--- a/apps/app_while.c
+++ b/apps/app_while.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/apps/app_zapateller.c b/apps/app_zapateller.c
index 6af9b963c6b128db085a5db3196f8d29d972275d..b102ea4260046583658ed752e427c3521043a9d4 100644
--- a/apps/app_zapateller.c
+++ b/apps/app_zapateller.c
@@ -24,6 +24,10 @@
  * 
  * \ingroup applications
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c
index 2b21933e2cb37ab6d0fca95ca41413a8498203ff..802e9ae30a30699993a393a6981f3e963dd85a29 100644
--- a/bridges/bridge_builtin_features.c
+++ b/bridges/bridge_builtin_features.c
@@ -25,6 +25,10 @@
  * \ingroup bridges
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/bridges/bridge_multiplexed.c b/bridges/bridge_multiplexed.c
index 5a3de43d8b775cdfeda18b538a4821558f08bace..e004dfd405f7d2bb33d2790281c0d34c5d1e8436 100644
--- a/bridges/bridge_multiplexed.c
+++ b/bridges/bridge_multiplexed.c
@@ -25,6 +25,10 @@
  * \ingroup bridges
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/bridges/bridge_simple.c b/bridges/bridge_simple.c
index 72b91087adfda9885e644249cc7907d1834b5b14..14864df4d7f154a303afed779818a044e0857900 100644
--- a/bridges/bridge_simple.c
+++ b/bridges/bridge_simple.c
@@ -25,6 +25,10 @@
  * \ingroup bridges
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c
index 00b0556d05fc80c1377ac2c4e825881e2e29548f..7632f36ee693aed3075b56dc967259e27f9d76dc 100644
--- a/bridges/bridge_softmix.c
+++ b/bridges/bridge_softmix.c
@@ -27,6 +27,10 @@
  * \ingroup bridges
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/cdr/cdr_adaptive_odbc.c b/cdr/cdr_adaptive_odbc.c
index db19896f21f8c5d7d46630da22f479fe7609b5aa..cb9bd0d529b29f97d4b94ebd3894700dd67a46c6 100644
--- a/cdr/cdr_adaptive_odbc.c
+++ b/cdr/cdr_adaptive_odbc.c
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
 	<depend>res_odbc</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index 60b96588085abde92f835f1d3bd73d267286e077..068b7a9a2f0035c6fb0dbab6bda91c0a33f502f6 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -28,6 +28,10 @@
  * \ingroup cdr_drivers
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/cdr/cdr_custom.c b/cdr/cdr_custom.c
index c834814e815187b2ae7c494aebd553924df96351..6a2751d1f2b0d1039dc9537981bf4deb602add62 100644
--- a/cdr/cdr_custom.c
+++ b/cdr/cdr_custom.c
@@ -30,6 +30,10 @@
  * \ingroup cdr_drivers
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/cdr/cdr_manager.c b/cdr/cdr_manager.c
index 4cc8183656b99e394c75985239a8b69dd9b7b991..d5106b158873b45de7618fe7481658b9686b8f0a 100644
--- a/cdr/cdr_manager.c
+++ b/cdr/cdr_manager.c
@@ -25,6 +25,10 @@
  * \ingroup cdr_drivers
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c
index f77d60b2c2891b84ebe11894d616dab9171fecb0..45f8bca795f4994345390fa3396e107a8e9d85a4 100644
--- a/cdr/cdr_odbc.c
+++ b/cdr/cdr_odbc.c
@@ -30,6 +30,7 @@
 
 /*** MODULEINFO
 	<depend>res_odbc</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index 826b09f3f1e905a52ec209e3653a051dfbc7f0da..e857baa87a7f9e93471f76a6ca708d98a99ee488 100644
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -35,6 +35,7 @@
 
 /*** MODULEINFO
 	<depend>pgsql</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index bf613284dc903281206311fb1f6bfa139cac880c..140e7a01c0fd3e569c1937cdc9c92e066bdf2b83 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<depend>radius</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c
index 2dcdf96a40b3eb1be6619f28c097478e3a6ac455..47d1a5192b24a250cb9539f4d4e8f2c7f556dc95 100644
--- a/cdr/cdr_sqlite.c
+++ b/cdr/cdr_sqlite.c
@@ -36,6 +36,9 @@
 
 /*** MODULEINFO
 	<depend>sqlite</depend>
+	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>sqlite3_custom</replacement>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_sqlite3_custom.c b/cdr/cdr_sqlite3_custom.c
index c2dae7a7bcf0ca6a30666e1b0bf95bca3e5daae5..97d1a309ec0f3e9164a6e5a9f46ee0057da7e673 100644
--- a/cdr/cdr_sqlite3_custom.c
+++ b/cdr/cdr_sqlite3_custom.c
@@ -34,6 +34,7 @@
 
 /*** MODULEINFO
 	<depend>sqlite3</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_syslog.c b/cdr/cdr_syslog.c
index 63545208eb1c6f602b5f0eb9fd38a6017f0dfa1b..b6fc90e0dd3a127e8b94c421869723b160dd84ec 100644
--- a/cdr/cdr_syslog.c
+++ b/cdr/cdr_syslog.c
@@ -28,7 +28,8 @@
  */
 
 /*** MODULEINFO
-	 <depend>syslog</depend>
+	<depend>syslog</depend>
+	<support_level>core</support_level>
 ***/
 
 #include "asterisk.h"
diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index fca815fd8325a8453c84ac85f511ec01e8eed51a..eead023fb067c2a52ef8a33620b3f189a8a55b8c 100644
--- a/cdr/cdr_tds.c
+++ b/cdr/cdr_tds.c
@@ -59,6 +59,7 @@ CREATE TABLE [dbo].[cdr] (
 
 /*** MODULEINFO
 	<depend>freetds</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/cel/cel_custom.c b/cel/cel_custom.c
index 9f7d589b49b32648c625c0add938510d22fb46f0..54b1e4f5ed476c28681fe826ced03107931c4e5b 100644
--- a/cel/cel_custom.c
+++ b/cel/cel_custom.c
@@ -29,6 +29,10 @@
  * \ingroup cel_drivers
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/cel/cel_manager.c b/cel/cel_manager.c
index fcf20766f99b505be2a5324940e216ede99d288e..551b861d058dbb51724bb91a62ff71021daf9b6d 100644
--- a/cel/cel_manager.c
+++ b/cel/cel_manager.c
@@ -29,6 +29,10 @@
  * \ingroup cel_drivers
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/cel/cel_odbc.c b/cel/cel_odbc.c
index d298f1ba2f99b864fe888a5056a3e2fa6bb48e14..f0c70f53c5febde12816a3b860952fea1472abf4 100644
--- a/cel/cel_odbc.c
+++ b/cel/cel_odbc.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<depend>res_odbc</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/cel/cel_pgsql.c b/cel/cel_pgsql.c
index 62438d8567d44ce2879b8b2aa049a3159adb10a3..4a67edd85df825a4e9123dde40ea201a197ca8d9 100644
--- a/cel/cel_pgsql.c
+++ b/cel/cel_pgsql.c
@@ -39,6 +39,7 @@
 
 /*** MODULEINFO
 	<depend>pgsql</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/cel/cel_radius.c b/cel/cel_radius.c
index f5ccb5f8a93ea4f55ef08b89ec615e8b42f9dd50..7cd7726e1fe653c7c589aa6cd6fb88d4b1dbc8b5 100644
--- a/cel/cel_radius.c
+++ b/cel/cel_radius.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<depend>radius</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/cel/cel_sqlite3_custom.c b/cel/cel_sqlite3_custom.c
index 18e2a9f1a39c3d484b74dc0b1013b03a76f37d3e..2906ed9ee9ed25e20234d8f67ff4bcb252ad4699 100644
--- a/cel/cel_sqlite3_custom.c
+++ b/cel/cel_sqlite3_custom.c
@@ -36,6 +36,7 @@
 
 /*** MODULEINFO
 	<depend>sqlite3</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/cel/cel_tds.c b/cel/cel_tds.c
index 37992bf5e8a0aa7508e06073432346ee0457925f..f5686c9b0cf7ddbe0ae050a99837d8867c71bfb0 100644
--- a/cel/cel_tds.c
+++ b/cel/cel_tds.c
@@ -56,6 +56,7 @@ CREATE TABLE [dbo].[cdr] (
 
 /*** MODULEINFO
 	<depend>freetds</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 0dc930f9dafbbc036c2a42f9d33f9d6089ee54bd..044524669e34537ba750fcbf8e78a91882199475 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -33,6 +33,7 @@
 /*** MODULEINFO
         <depend>chan_local</depend>
         <depend>res_monitor</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index b1e7c30e55aaa3a2e7053bc5aa408c94c436e288..b51c942af3a04a1baaaabe92a6b8e61398a8e3e5 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<depend>alsa</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_bridge.c b/channels/chan_bridge.c
index 7b01909ae8f2a56edc4232f6faaf0793ac6adfb1..36f23a500c37ae197fab2011fac6e4946d6e5bcb 100644
--- a/channels/chan_bridge.c
+++ b/channels/chan_bridge.c
@@ -25,6 +25,10 @@
  * \ingroup channel_drivers
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/chan_console.c b/channels/chan_console.c
index a5f22be2dcf77ece5a97a956428b1052d5542130..a0eddbeae31777d3b1a2c7f1319aebd2733b4e1a 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -49,6 +49,7 @@
 
 /*** MODULEINFO
 	<depend>portaudio</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index b94889ef41662c6c7371ebc930f3dd2cd793e120..079831340eb4356e2e99eadcc9ef5df27eb69551 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -44,6 +44,7 @@
 	<use type="external">pri</use>
 	<use type="external">ss7</use>
 	<use type="external">openr2</use>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 326cb69dba2a215a66ceace14c2f9e08c39517b5..a15fca975b6f9025a83bbf6d11630f75ef60b029 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -35,6 +35,7 @@
 	<depend>iksemel</depend>
 	<depend>res_jabber</depend>
 	<use type="external">openssl</use>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 07646652f5bdf150b511c6d5cb91029572c26c16..e90bee18c3221e703c14ba0171a67c30e2744f03 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -36,7 +36,9 @@
 
 /*** MODULEINFO
 	<depend>openh323</depend>
-	<defaultenabled>yes</defaultenabled>
+	<defaultenabled>no</defaultenabled>
+	<support_level>deprecated</support_level>
+	<replacement>chan_ooh323</replacement>
  ***/
 
 #ifdef __cplusplus
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 9f5f32deb60db2bf48cfffbdd3a402f9e45bafcc..dff1bfda21f82b05dcb27b2ce87851d56a2c721a 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -33,6 +33,7 @@
 
 /*** MODULEINFO
 	<use type="external">crypto</use>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index 53b1a85e40b396352867695da4a2dee555aafded..86a6410db1af31dd8739ca05e83655db09a681bd 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -31,6 +31,8 @@
 	<depend>iksemel</depend>
 	<depend>res_jabber</depend>
 	<use type="external">openssl</use>
+	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 3c16fc51a0747b989e6360296921e95fa27df3f6..937ede4c229d893a7a57703d5e69173742dfa454 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -25,6 +25,10 @@
  * \ingroup channel_drivers
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index bd92fe9b0eaf2ab337025876cdd2d1b0791a93ac..dfd5a310f33fed9d3cda8b2e6253656b290d16db 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -31,6 +31,7 @@
 
 /*** MODULEINFO
         <use type="module">res_pktccops</use>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index d6e10aebe25083487a63d8c3434cb66d2a0965b0..e9fa800106c9bacc362340bdb217cd326c820725 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -53,6 +53,7 @@
 	<depend>isdnnet</depend>
 	<depend>misdn</depend>
 	<depend>suppserv</depend>
+	<support_level>extended</support_level>
  ***/
 #include "asterisk.h"
 
diff --git a/channels/chan_multicast_rtp.c b/channels/chan_multicast_rtp.c
index b398abb21375ebc616724f5b94c6960e7d87a5d3..929525ffb1bd6ea39984557a8fcebf138821cd4a 100644
--- a/channels/chan_multicast_rtp.c
+++ b/channels/chan_multicast_rtp.c
@@ -27,6 +27,10 @@
  * \ingroup channel_drivers
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/chan_nbs.c b/channels/chan_nbs.c
index fdfbd8eb3ac206be26ab3c2a9e42af08fb36f5d9..3ff97dde7829ee5425f29f5c80cf286c7f617ffa 100644
--- a/channels/chan_nbs.c
+++ b/channels/chan_nbs.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>nbs</depend>
+	<support_level>extended</support_level>	
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 67c55c592d7d616539f1e036da3484e072446baf..a8ca79a3ee3aa8101b855bcdbb6eb77e2a3a9393 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -35,6 +35,7 @@
 
 /*** MODULEINFO
 	<depend>oss</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_phone.c b/channels/chan_phone.c
index 4b7ec9721d545ef87cc16da7092fefc1a790e2f8..6acb7a18470f38fa795a6e503c72db8ecd874731 100644
--- a/channels/chan_phone.c
+++ b/channels/chan_phone.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>ixjuser</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2e7b6f7f947e25e7c296ed7a0dc8c4cc95da8368..fec843627fe77ede5b4122ade7fa394ccafb4955 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -164,6 +164,7 @@
 /*** MODULEINFO
 	<use type="module">res_crypto</use>
 	<depend>chan_local</depend>
+	<support_level>core</support_level>
  ***/
 
 /*!  \page sip_session_timers SIP Session Timers in Asterisk Chan_sip
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index ea7d16c9e33684aa61488ff9ad7d7d55f40432ee..80338c7d02ea6a240e3a73156eeb38530d0309fc 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -25,6 +25,9 @@
  * \ingroup channel_drivers
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
 
 #include "asterisk.h"
 
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c
index f4b92330eaed22585d3fce2ec9f39d271074d233..8f0cfa59e42f90eb46bc6c29cf70c167a51db3c1 100644
--- a/channels/chan_unistim.c
+++ b/channels/chan_unistim.c
@@ -32,6 +32,10 @@
  * \ingroup channel_drivers
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c
index 925629f850cee448d4f5188fc087b9b8920ff5b6..62a26de7f6fb13de43663aeabe4518424c3d1506 100644
--- a/channels/chan_usbradio.c
+++ b/channels/chan_usbradio.c
@@ -38,6 +38,7 @@
 	<depend>alsa</depend>
 	<depend>usb</depend>
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 /*** MAKEOPTS
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index 0215ab82f5a4596973ff91e2e48144d52f37155a..b4e9858ee9d55fd477e04c504b28211ec266d690 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -31,6 +31,8 @@
 
 /*** MODULEINFO
 	<depend>vpb</depend>
+	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include <vpbapi.h>
diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c
index a7d86e2c4cc7fd7ff698af2ddca047e03c28fb53..470f363e7dcb26bb370099c6a35021fa373eaea2 100644
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -23,6 +23,10 @@
  * \ingroup codecs
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index 63745c17041927481111e4ddd887cbef8493159f..96e19f0d3c6c5b5a774894572822d62abf7fab90 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -27,6 +27,10 @@
  * \ingroup codecs
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 3d2fc92aec3871f8d7f2041853a9767a5773a293..34a71388eb2b291a6dea80f9e4d6175163d2980b 100644
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -23,6 +23,10 @@
  * \ingroup codecs
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c
index 9c3a018468280b5e0a144464509c3b0145d7d95a..89641f175145a777b2abb876a535a6dfad1608fb 100644
--- a/codecs/codec_g722.c
+++ b/codecs/codec_g722.c
@@ -33,6 +33,10 @@
  * \ingroup codecs
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/codecs/codec_g726.c b/codecs/codec_g726.c
index f8a57f740eb92d0a62b75929217874f581032e7c..d92b9b642231d13950adaee7bdad1d23444659bc 100644
--- a/codecs/codec_g726.c
+++ b/codecs/codec_g726.c
@@ -27,6 +27,10 @@
  * \ingroup codecs
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index 46c1c84fb88c2ddd8d560b131f147eb2e8dc98b4..f42a5f1bd584ee21b40dc90b923441cb27505878 100644
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<depend>gsm</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/codecs/codec_ilbc.c b/codecs/codec_ilbc.c
index 7229b434d63cbe7584cc031e03182e5de5af804c..ac6ccbb43f739a4de2b93396f31aeca166ba4321 100644
--- a/codecs/codec_ilbc.c
+++ b/codecs/codec_ilbc.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/codecs/codec_lpc10.c b/codecs/codec_lpc10.c
index 7d1739203f42e410d8c1a36a3e71fa2d5e661201..5f2047a3fdeb86e6d5f735aabc8ae8811f12dfd4 100644
--- a/codecs/codec_lpc10.c
+++ b/codecs/codec_lpc10.c
@@ -27,6 +27,10 @@
  * \ingroup codecs
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/codecs/codec_resample.c b/codecs/codec_resample.c
index 66ef584bd7b0402aa79a149ee045a444a08b2df0..a3e7d6f267a5eefc143ad2e5e9ff8760c46abd2a 100644
--- a/codecs/codec_resample.c
+++ b/codecs/codec_resample.c
@@ -25,6 +25,11 @@
  * \ingroup codecs
  */
 
+/*** MODULEINFO
+	<depend>resample</depend>
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 #include "speex/speex_resampler.h"
 
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index 6554ee000ab20ed596d4930a0d08a9a7633ccc1d..d298f2379301bcb211e89c339aef821d2cb3bdda 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -34,6 +34,7 @@
 	<depend>speex</depend>
 	<depend>speex_preprocess</depend>
 	<use type="external">speexdsp</use>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index b5211a585aaee453883b7160e9a5f2ce2ece4a3f..86a0706c40adc8e310d1471d54ff0830a6482d2c 100644
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -23,6 +23,10 @@
  * \ingroup codecs
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/formats/format_g719.c b/formats/format_g719.c
index b679122f87cf0a0ad1cc4f63f8670d3245eff332..aace0edc739cd776e38415d53b304b817f2bdc25 100644
--- a/formats/format_g719.c
+++ b/formats/format_g719.c
@@ -22,6 +22,10 @@
  * \arg File name extensions: g719
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_g723.c b/formats/format_g723.c
index 6dab66a8603f1ac2834c4b38b2069cfe38a51661..7eba74147561454214330d98d61db3fa4234de42 100644
--- a/formats/format_g723.c
+++ b/formats/format_g723.c
@@ -24,6 +24,10 @@
  * \arg Extensions: g723, g723sf
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_g726.c b/formats/format_g726.c
index 73a57c8eef5413b5d027a3d883cc998711b1ad81..636aff091b8f07f04595d995f2b6d7ece7e04883 100644
--- a/formats/format_g726.c
+++ b/formats/format_g726.c
@@ -27,6 +27,10 @@
  * \arg 16 kbps: g726-16
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_g729.c b/formats/format_g729.c
index 22b3c3282d595a147488b7e2efe58fe19a87b9bf..042977728c329230e6f53d7b76f7a0bc92dc75d6 100644
--- a/formats/format_g729.c
+++ b/formats/format_g729.c
@@ -25,6 +25,10 @@
  * \arg Extensions: g729 
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_gsm.c b/formats/format_gsm.c
index 26257c39fb73bfd3e2d83545df2ec77cc0266010..03419c2f6192c524507926cf3b96feec116d268d 100644
--- a/formats/format_gsm.c
+++ b/formats/format_gsm.c
@@ -22,6 +22,10 @@
  * \arg File name extension: gsm
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_h263.c b/formats/format_h263.c
index 76555a67c927fc7f1735dd85f8e48cb97625b1fe..77c1229c383ee4fc94edcc4237655f69b1f388da 100644
--- a/formats/format_h263.c
+++ b/formats/format_h263.c
@@ -23,6 +23,10 @@
  * \ingroup formats
  * \arg See \ref AstVideo
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_h264.c b/formats/format_h264.c
index ea82454f3569b2c7e491125ad00b1dde1495584e..155f469759f215058a72dd8924970ab60264412b 100644
--- a/formats/format_h264.c
+++ b/formats/format_h264.c
@@ -23,6 +23,10 @@
  * \ingroup formats
  * \arg See \ref AstVideo
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c
index a60b585d7186a26a6c3d83c4d2de32c0e4c054e0..7a08ca515c8a01554abc6834d61e8f1fda2125a5 100644
--- a/formats/format_ilbc.c
+++ b/formats/format_ilbc.c
@@ -25,6 +25,10 @@
  * \ingroup formats
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c
index 99de8dac1b4496ad38b8eaace2ee2f09e27f916e..d6733020ec61ba3a5da6b112ee5faa8cbe4f00b3 100644
--- a/formats/format_jpeg.c
+++ b/formats/format_jpeg.c
@@ -23,6 +23,10 @@
  * \arg File name extension: jpeg, jpg
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index 949a13f78b3823a91adedf8807ad88634ee56296..46056b89480c33046a42a1e4b320b6083b3582b9 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -28,6 +28,7 @@
 /*** MODULEINFO
 	<depend>vorbis</depend>
 	<depend>ogg</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/formats/format_pcm.c b/formats/format_pcm.c
index ec628c5b3043ca0d1d7736c18d7f3195e122bb3d..3bf27388c627cc4ae83d60a5741f5d02630110c1 100644
--- a/formats/format_pcm.c
+++ b/formats/format_pcm.c
@@ -23,6 +23,10 @@
  * 
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_siren14.c b/formats/format_siren14.c
index 53c9ea92211066017f3b450c757ed94b85b67fd8..1ce50fad4be28bc51ad2f72793e71a87de88bec8 100644
--- a/formats/format_siren14.c
+++ b/formats/format_siren14.c
@@ -22,6 +22,10 @@
  * \arg File name extensions: siren14
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_siren7.c b/formats/format_siren7.c
index 16eca5df59d9235185c8ef8b864ad6d157ac9ad5..2e5182d3c665fa5988f43b5a398bef04ce0ccf20 100644
--- a/formats/format_siren7.c
+++ b/formats/format_siren7.c
@@ -22,6 +22,10 @@
  * \arg File name extensions: siren7
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_sln.c b/formats/format_sln.c
index 91cb4584af02bddd0d4ab04e90e0575c57c693c6..1a73cdfbbf977bae3ae589aa9172454e488dea20 100644
--- a/formats/format_sln.c
+++ b/formats/format_sln.c
@@ -21,6 +21,10 @@
  * \ingroup formats
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+ 
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/formats/format_vox.c b/formats/format_vox.c
index 05ecdeeaff6343f1a4678aa627595419b9051a80..7d34df99cbda560aea6843d4499c2268acbf6443 100644
--- a/formats/format_vox.c
+++ b/formats/format_vox.c
@@ -23,6 +23,10 @@
  * 
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/formats/format_wav.c b/formats/format_wav.c
index f35fd527876d2ecad1fbc05a1dae4f194ba346a8..f311522e5f120c55bbac7498541531035ff276cc 100644
--- a/formats/format_wav.c
+++ b/formats/format_wav.c
@@ -24,6 +24,10 @@
  * \ingroup formats
  */
  
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c
index ae1f11ed8df7a506d5f3d589b4b8dbb4b2cf700b..35d4339f9658f7fa46dda2ece09c3e0d677be359 100644
--- a/formats/format_wav_gsm.c
+++ b/formats/format_wav_gsm.c
@@ -26,6 +26,10 @@
  * e-mail attachments mainly.
  * \ingroup formats
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index 891106b6f32ec049b0e9830227d4ae2690bf5fc2..c176f486351eeec2ff6e4df827029578828a5334 100644
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -24,6 +24,7 @@
 
 /*** MODULEINFO
 	<use type="external">crypto</use>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/funcs/func_audiohookinherit.c b/funcs/func_audiohookinherit.c
index 528aed51fb9e56a1d55dab9294b284db4922c35d..59faa90198aef8f279276e72168c79b7750654b4 100644
--- a/funcs/func_audiohookinherit.c
+++ b/funcs/func_audiohookinherit.c
@@ -28,6 +28,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 #include "asterisk/datastore.h"
 #include "asterisk/channel.h"
diff --git a/funcs/func_base64.c b/funcs/func_base64.c
index 274e291cec828bbd7579ea2f382f8f9b68bb410d..1a7619d9161e610cf84a492c03890197735eb9e8 100644
--- a/funcs/func_base64.c
+++ b/funcs/func_base64.c
@@ -22,6 +22,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_blacklist.c b/funcs/func_blacklist.c
index b940b5891be801cc64261444081df4375b23bed0..be3bbc5fbd723a87b751fe0de0112c05cef4ace3 100644
--- a/funcs/func_blacklist.c
+++ b/funcs/func_blacklist.c
@@ -26,6 +26,10 @@
  * 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_callcompletion.c b/funcs/func_callcompletion.c
index b3fab310f4ce2d2b183cfc8a769b993a13d8e6ed..cee06faa47ad50edad2a1a85605ff3a4d55de757 100644
--- a/funcs/func_callcompletion.c
+++ b/funcs/func_callcompletion.c
@@ -21,6 +21,10 @@
  * \author Mark Michelson <mmichelson@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c
index a653d8660cb26c7b0fd1b45821ee534845223d88..bb631fe4ead9b4e882d1ceee4515056711db49fd 100644
--- a/funcs/func_callerid.c
+++ b/funcs/func_callerid.c
@@ -24,6 +24,10 @@
  * \arg \ref AstCREDITS
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_cdr.c b/funcs/func_cdr.c
index 3d0c846f969ffb1bfd5771bdb9b18520ad56f148..34fdd6736eb3b070c284df6d0c4186b537da8cb6 100644
--- a/funcs/func_cdr.c
+++ b/funcs/func_cdr.c
@@ -25,6 +25,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_channel.c b/funcs/func_channel.c
index 202036e84fd594dcec92640e03d5bbb09cf428a1..7baf2485ef942811b2d574a97f6f457ee0c155e6 100644
--- a/funcs/func_channel.c
+++ b/funcs/func_channel.c
@@ -24,6 +24,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_config.c b/funcs/func_config.c
index 21d291c2e5bcf7a10374befdc7bac6ee7faa078d..cbc51aaae6ecc0e70e34c777ab849e45f3b49521 100644
--- a/funcs/func_config.c
+++ b/funcs/func_config.c
@@ -27,6 +27,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_curl.c b/funcs/func_curl.c
index 24f6fd923f54a08f8ce9e2af86aaae9091d6cee7..7e97eb56eb2148287917871aff07ed21228722de 100644
--- a/funcs/func_curl.c
+++ b/funcs/func_curl.c
@@ -32,6 +32,7 @@
  
 /*** MODULEINFO
 	<depend>curl</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/funcs/func_cut.c b/funcs/func_cut.c
index 10bca0a9f11f953a42866b525ed179b1802737db..762dd61fe1ab2e91fc7e5877abd1d6b0cb80c947 100644
--- a/funcs/func_cut.c
+++ b/funcs/func_cut.c
@@ -24,6 +24,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_db.c b/funcs/func_db.c
index a932cf5b15e2d6a69d25fd731464c1929dce91cc..20c8829a616b1cf7c2ee40748de5bab051f2f73a 100644
--- a/funcs/func_db.c
+++ b/funcs/func_db.c
@@ -27,6 +27,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_devstate.c b/funcs/func_devstate.c
index 396657768c7cfa54272aee9b8808a49f71bb92eb..274f1ac03977f819616d99e5362570f2f342c770 100644
--- a/funcs/func_devstate.c
+++ b/funcs/func_devstate.c
@@ -30,6 +30,10 @@
  *       when I couldn't sleep.  :)
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_dialgroup.c b/funcs/func_dialgroup.c
index b1fa78017ae842911db09d1ffdbd7e377ec219b0..4a789d627dff330b0251d23ceaae326f21da9068 100644
--- a/funcs/func_dialgroup.c
+++ b/funcs/func_dialgroup.c
@@ -25,6 +25,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_dialplan.c b/funcs/func_dialplan.c
index 4e1ab3bed4558d0cd1cb980810b3da97300c218f..c39b3e3766bd20d8f8a75ec793b8e93430469573 100644
--- a/funcs/func_dialplan.c
+++ b/funcs/func_dialplan.c
@@ -24,6 +24,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_enum.c b/funcs/func_enum.c
index d8c8b252d7ec89e9dfc569d4c6eeb0d11fed69a6..cc4d47a789214adb78142f19ea9f6605b9d2cdcd 100644
--- a/funcs/func_enum.c
+++ b/funcs/func_enum.c
@@ -33,6 +33,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_env.c b/funcs/func_env.c
index aa0abb4b3307b1c7ba2a08e6dd3d93c59711e108..c7b431dca861ed5efb1230c95c34ba70162785ce 100644
--- a/funcs/func_env.c
+++ b/funcs/func_env.c
@@ -21,6 +21,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_extstate.c b/funcs/func_extstate.c
index d3c7ba4b7163508ad41ee2ac630986078d068503..940c455c281a2076612bbe7ff47b5fe332ed8fbc 100644
--- a/funcs/func_extstate.c
+++ b/funcs/func_extstate.c
@@ -26,6 +26,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_frame_trace.c b/funcs/func_frame_trace.c
index 03711ee7d7c90b97a5e83ab2e47d4aaae659c453..681f151fc5b37be44bb2c2a5d3d89d236f24d49c 100644
--- a/funcs/func_frame_trace.c
+++ b/funcs/func_frame_trace.c
@@ -25,6 +25,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_global.c b/funcs/func_global.c
index a501aee58d0163cb0fe3133265e1854e6334179d..6b158aafbb6c7159fd86cf6559b712ad9ed9133c 100644
--- a/funcs/func_global.c
+++ b/funcs/func_global.c
@@ -25,6 +25,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c
index 70c396436393f2aebb74aac2033cb8ef0437515e..609d01fefae5f6359f77ada0e2d67bee0c238560 100644
--- a/funcs/func_groupcount.c
+++ b/funcs/func_groupcount.c
@@ -21,6 +21,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_iconv.c b/funcs/func_iconv.c
index 231b4880f24b4834843003982ebbbb1f60c353dd..4c4f65f1acb6aa2115c02c3cdec5c11a0d5d06d5 100644
--- a/funcs/func_iconv.c
+++ b/funcs/func_iconv.c
@@ -25,7 +25,8 @@
  */
 
 /*** MODULEINFO
-    <depend>iconv</depend>
+	<depend>iconv</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/funcs/func_lock.c b/funcs/func_lock.c
index 27d199e367d94556f9d4224d2992b5b2aa69769f..c3cf7a98729e1f0d54e7470d6a36856c876c1bef 100644
--- a/funcs/func_lock.c
+++ b/funcs/func_lock.c
@@ -26,6 +26,10 @@
  * 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_logic.c b/funcs/func_logic.c
index 27734ed7844beaf20fd82addfd1c34581742bd82..21f08a13f51a523b7d1f114f481a967a80a4b451 100644
--- a/funcs/func_logic.c
+++ b/funcs/func_logic.c
@@ -24,6 +24,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_math.c b/funcs/func_math.c
index f3a690c5d636ab98155854bb0a04c568766db35f..e7217c7b3d4eb97e20fc0254f771cea1d39170f7 100644
--- a/funcs/func_math.c
+++ b/funcs/func_math.c
@@ -28,6 +28,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_md5.c b/funcs/func_md5.c
index 7c61d9f8cc066fb7209c94fc111585c7f3362cff..2e601858647d17233c9b944da09e4beb6e0fe943 100644
--- a/funcs/func_md5.c
+++ b/funcs/func_md5.c
@@ -26,6 +26,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_module.c b/funcs/func_module.c
index 44ec08e4db159e8c32fcb7d54d84aead95631e67..b0b346116956cff94b240fc44ca9db2c3b230156 100644
--- a/funcs/func_module.c
+++ b/funcs/func_module.c
@@ -21,6 +21,11 @@
  *
  * \ingroup functions
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c
index fad548a92e2cbd4aa7dbd6c74648de6760c651a6..6cef946dfdfcd3c529c5802db2c397c092bc6bdf 100644
--- a/funcs/func_odbc.c
+++ b/funcs/func_odbc.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<depend>res_odbc</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/funcs/func_pitchshift.c b/funcs/func_pitchshift.c
index b14894712fa906b6b99376eeb069f6a9564b19c7..ca441f985079d9385f6cb655012c9e7c02a9aab8 100644
--- a/funcs/func_pitchshift.c
+++ b/funcs/func_pitchshift.c
@@ -58,6 +58,10 @@
 *
 *****************************************************************************/
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_rand.c b/funcs/func_rand.c
index 2d4e02fcf4ce7018a14bd4ec87e2796a8537a067..6491b371de8a86c9aa7234f0474457b2d6f57222 100644
--- a/funcs/func_rand.c
+++ b/funcs/func_rand.c
@@ -24,6 +24,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_sha1.c b/funcs/func_sha1.c
index 985e11a3838742b471e7da3df376257b5d83c71f..c6b7575454e641b95d7f49f19ac501cda7478e29 100644
--- a/funcs/func_sha1.c
+++ b/funcs/func_sha1.c
@@ -24,6 +24,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_shell.c b/funcs/func_shell.c
index df7164d5f519acb422b68d881316ecaaaa4eb464..1f274b83d5635f21cefee4a3c6bfa7dbc7123c10 100644
--- a/funcs/func_shell.c
+++ b/funcs/func_shell.c
@@ -25,6 +25,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_speex.c b/funcs/func_speex.c
index e17e8ca9c00e74cc911d537da13b920ce4773d89..2b29271f336f9cd415535ce3b4964ee0f11607de 100644
--- a/funcs/func_speex.c
+++ b/funcs/func_speex.c
@@ -34,6 +34,7 @@
 	<depend>speex</depend>
 	<depend>speex_preprocess</depend>
 	<use type="external">speexdsp</use>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/funcs/func_sprintf.c b/funcs/func_sprintf.c
index 4e3fbb99cf28a1e329e4f28a43fad7d0274251f1..4d5fc7a6c0819b613ce7377b33a1e210f1a7fc7a 100644
--- a/funcs/func_sprintf.c
+++ b/funcs/func_sprintf.c
@@ -25,6 +25,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_srv.c b/funcs/func_srv.c
index de48f0d0639e965c4acabc348755d1a8e0f2976d..deb94835fa17ebbfb8375dd4dfc2d6e22819cb26 100644
--- a/funcs/func_srv.c
+++ b/funcs/func_srv.c
@@ -23,6 +23,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_strings.c b/funcs/func_strings.c
index 0d2b95efc375e5275b7655d6eea019b2789ec639..055fd0c4e09597282c509f89494b257dd8ddd906 100644
--- a/funcs/func_strings.c
+++ b/funcs/func_strings.c
@@ -25,6 +25,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_sysinfo.c b/funcs/func_sysinfo.c
index 2d9a8dd24e34428d7be9fdea1c8ecbe7e6fa4f04..a7e358bb833a233e5ff3626176f3c190d84f8e86 100644
--- a/funcs/func_sysinfo.c
+++ b/funcs/func_sysinfo.c
@@ -25,6 +25,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision: 87233 $")
diff --git a/funcs/func_timeout.c b/funcs/func_timeout.c
index 79d908d18774a4f462f7751e8978ab88e763ef84..53bbab753139ccc328cff0155f00199eab088bfd 100644
--- a/funcs/func_timeout.c
+++ b/funcs/func_timeout.c
@@ -24,6 +24,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_uri.c b/funcs/func_uri.c
index ecf23d8ff63a54068396418b81febec657b0f13b..f4ecf3d67b0d0180a635211d4dc34835e0402969 100644
--- a/funcs/func_uri.c
+++ b/funcs/func_uri.c
@@ -28,6 +28,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_version.c b/funcs/func_version.c
index 8ed6c218f5a3fc66bd816f5495632c244e579d76..d8ba757a4041d579264ce2c096fabe45eb7bb623 100644
--- a/funcs/func_version.c
+++ b/funcs/func_version.c
@@ -22,6 +22,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_vmcount.c b/funcs/func_vmcount.c
index f409e75cee03a9973c9fc0224bf09b19fa14edbd..c4d80d499e45cb02f06c87aff433236e5d924ef9 100644
--- a/funcs/func_vmcount.c
+++ b/funcs/func_vmcount.c
@@ -25,6 +25,10 @@
  * \ingroup functions
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/funcs/func_volume.c b/funcs/func_volume.c
index 938fbba38ab8a1c38c66755da2ee91d133a64ea8..806564beeeb473ef581e99f1eeccdb6081679c6c 100644
--- a/funcs/func_volume.c
+++ b/funcs/func_volume.c
@@ -26,6 +26,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/features.c b/main/features.c
index 06ec1b698e6c65fa7769dd4257e8704a3afc8913..7f8444c1742e4afdabedea38acd3014fe3de729d 100644
--- a/main/features.c
+++ b/main/features.c
@@ -23,6 +23,10 @@
  * \author Mark Spencer <markster@digium.com> 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/http.c b/main/http.c
index 63d91c2b2ad23006c81a7942384ad9ccaf46dc60..724a58fdcfeb1c4225764680a3f68669a97bc48c 100644
--- a/main/http.c
+++ b/main/http.c
@@ -30,6 +30,10 @@
  * \ref AstHTTP - AMI over the http protocol
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/main/manager.c b/main/manager.c
index edaad357fdf18e30ac980d3bcdd14e0d94a4296a..98daad0843b389bd57a093741e5b05c77262776c 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -41,6 +41,10 @@
 /*! @{
  Doxygen group */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index 96c65ff6d0ed34986a263a47cbcf37c26f28d9ad..94a6212fa402226834f5ef1992ed10714102777d 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -24,6 +24,7 @@
 
 /*** MODULEINFO
 	<depend>res_ael_share</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index e02ef9de6ba6848105351f22d09aeb8d2b683c53..f0da2e87aeb759634576e82fb9fd2eab73724ad1 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -23,6 +23,10 @@
  * 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 26418d760e31b5c971c165e96235a07d3430c756..f2f556915aaeed13f0e0765988ce83dd2d32fcbe 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -24,6 +24,7 @@
 /*** MODULEINFO
 	<depend>zlib</depend>
 	<use type="external">crypto</use>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index e283127a08d851a9fb7fcbba3e9f46e4a40f400b..915a0cb10a32ab1b5b8aa65e19f74519be09d72b 100644
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -22,6 +22,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/pbx/pbx_lua.c b/pbx/pbx_lua.c
index cae82adba51247c8b6a4ff9a68ebd95007f0376d..c1088629bf476ec76d85ea9fb8ffdcd3f8b2988a 100644
--- a/pbx/pbx_lua.c
+++ b/pbx/pbx_lua.c
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
 	<depend>lua</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index f183c867b07a0986185c7a38f12adcf796b52459..51254a87154879659e294ee0130cb719b9851559 100644
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -23,6 +23,10 @@
  * \arg See also: \ref AstARA
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index b9086635712331e163104bc1f4b297dab3cb9185..b45ff6a5910d1e11451210d7758d57a8bfbe7f5d 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -22,6 +22,10 @@
  * 
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_adsi.c b/res/res_adsi.c
index 0a1f623a5af31966c57fdddce80d784d3c6c11b9..77875249570013905c80a4fbde997a4b3996f9d8 100644
--- a/res/res_adsi.c
+++ b/res/res_adsi.c
@@ -30,6 +30,10 @@
  * 	res_adsi to load
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_ael_share.c b/res/res_ael_share.c
index 805dfd9a83df70dcbb7dd79eff640bf394838e8a..f1ae9f33f548cddd86ff182764c25a72a6c090f5 100644
--- a/res/res_ael_share.c
+++ b/res/res_ael_share.c
@@ -25,6 +25,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_agi.c b/res/res_agi.c
index b57c498df5ea4cc5048279b984fb4938bda8dd52..87ae21a6df7c17003fba6bbdb3c6a28bacfd50c2 100644
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -25,6 +25,10 @@
  * \todo Convert the rest of the AGI commands over to XML documentation
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_ais.c b/res/res_ais.c
index 9bcceeade9876ff94ed508f3516e880d112b1d2b..c64e8e674269f7946f70074faffb07f98249dd70 100644
--- a/res/res_ais.c
+++ b/res/res_ais.c
@@ -34,6 +34,7 @@
 
 /*** MODULEINFO
 	<depend>ais</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_calendar.c b/res/res_calendar.c
index e6b724bafcf8c330d2a350e9a0faa1a43f9535cb..b7755378171f176a5b38017c23ffd97c09b2e901 100644
--- a/res/res_calendar.c
+++ b/res/res_calendar.c
@@ -23,6 +23,10 @@
  * \todo Support writing attendees
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_calendar_caldav.c b/res/res_calendar_caldav.c
index dd150afd6ca808efb6c9257762e84d5cb7ff38f3..14fce0ca7ebe391730ddd73f3b590cd1aba2a263 100644
--- a/res/res_calendar_caldav.c
+++ b/res/res_calendar_caldav.c
@@ -24,7 +24,9 @@
 	<depend>neon</depend>
 	<depend>ical</depend>
 	<depend>libxml2</depend>
+	<support_level>core</support_level>
 ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_calendar_ews.c b/res/res_calendar_ews.c
index 31df353121d36d434290c784eee034bc6b8945b2..51761127eb626265d8b4c0eedaf6c5716a6a920f 100644
--- a/res/res_calendar_ews.c
+++ b/res/res_calendar_ews.c
@@ -22,7 +22,9 @@
 
 /*** MODULEINFO
 	<depend>neon29</depend>
+	<support_level>core</support_level>
 ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_calendar_exchange.c b/res/res_calendar_exchange.c
index 2238124db412d135c0003f8a2f179427a5e5e650..4a2df1822c825e041a278d908bec6b807b9145bc 100644
--- a/res/res_calendar_exchange.c
+++ b/res/res_calendar_exchange.c
@@ -24,7 +24,9 @@
 	<depend>neon</depend>
 	<depend>ical</depend>
 	<depend>iksemel</depend>
+	<support_level>core</support_level>
 ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_calendar_icalendar.c b/res/res_calendar_icalendar.c
index d503eac35a717c884ab61cd5d7b0fbbf355f1b6e..8ef269e4f3733f74b4320c51340ff43de7105d82 100644
--- a/res/res_calendar_icalendar.c
+++ b/res/res_calendar_icalendar.c
@@ -23,7 +23,9 @@
 /*** MODULEINFO
 	<depend>neon</depend>
 	<depend>ical</depend>
+	<support_level>core</support_level>
 ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_clialiases.c b/res/res_clialiases.c
index e2558f2748a53795af2b74ce032f57e5ca91591f..d67f3ba39b792b377103719390979017c9f4bf04 100644
--- a/res/res_clialiases.c
+++ b/res/res_clialiases.c
@@ -26,6 +26,9 @@
  * CLI commands.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
 
 #include "asterisk.h"
 
diff --git a/res/res_clioriginate.c b/res/res_clioriginate.c
index f244c165dc492733cb5d8081b101d1b0bd3bda28..8a30be0735e0fc03a60d0c22e69a173b4880c28b 100644
--- a/res/res_clioriginate.c
+++ b/res/res_clioriginate.c
@@ -24,6 +24,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
diff --git a/res/res_config_curl.c b/res/res_config_curl.c
index 8488d9bdc1a8776f416a7e0def273f49d7dca007..bb8d9b39ba016495edf2781e45bc66cb0bf84551 100644
--- a/res/res_config_curl.c
+++ b/res/res_config_curl.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<depend>curl</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_config_ldap.c b/res/res_config_ldap.c
index adfdacb28defbbf15f7fe5b98032b82ff6b586a0..55e1526d53de14a053102d6be39c4e1228128e8f 100644
--- a/res/res_config_ldap.c
+++ b/res/res_config_ldap.c
@@ -33,6 +33,7 @@
 
 /*** MODULEINFO
 	<depend>ldap</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c
index f52f941be99a58d124de2b3b1819f68d51fce043..86cc25c86e586594f71e83927113362af7b31e36 100644
--- a/res/res_config_odbc.c
+++ b/res/res_config_odbc.c
@@ -30,6 +30,7 @@
 
 /*** MODULEINFO
 	<depend>res_odbc</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index bbc683a478a991c55d02887deed31e34b71f8349..6ed6bd294f22020921fc590db293c63408f9a46a 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -24,6 +24,7 @@
 
 /*** MODULEINFO
 	<depend>pgsql</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_config_sqlite.c b/res/res_config_sqlite.c
index 75d353cd554a93b08c89327a7884d131c51bb8d2..fbeeac27504e6e34517a83e1cad5b703c610e31d 100644
--- a/res/res_config_sqlite.c
+++ b/res/res_config_sqlite.c
@@ -73,6 +73,7 @@
 
 /*** MODULEINFO
 	<depend>sqlite</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_convert.c b/res/res_convert.c
index 94d6e1e59c1038fcd0010ef276559e3dc3d9ef41..c2966a85f2d93c340e5718550e3ee96126fedb88 100644
--- a/res/res_convert.c
+++ b/res/res_convert.c
@@ -26,6 +26,10 @@
  *
  */ 
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_crypto.c b/res/res_crypto.c
index e25b8a4d6d651b7630312257b6945f637d59e8d3..4ae0851d693174b950b762d78427c5ec3f579f35 100644
--- a/res/res_crypto.c
+++ b/res/res_crypto.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<depend>openssl</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_fax.c b/res/res_fax.c
index 31aede8a655e0f067e5dd72ceca74b0e316d8c0d..8073f2d6e9433c78416a2b7034b67154bfda070f 100644
--- a/res/res_fax.c
+++ b/res/res_fax.c
@@ -53,6 +53,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_fax_spandsp.c b/res/res_fax_spandsp.c
index 02657583d4f2ed900575bcf09150a1d047ac9692..296dd07a630f5932bfaf798f17aa0a1ca62efa92 100644
--- a/res/res_fax_spandsp.c
+++ b/res/res_fax_spandsp.c
@@ -45,6 +45,7 @@
 /*** MODULEINFO
 	<depend>spandsp</depend>
 	<depend>res_fax</depend>
+	<support_level>extended</support_level>
 ***/
 
 #include "asterisk.h"
diff --git a/res/res_http_post.c b/res/res_http_post.c
index c0719b6dab56c040359fd6ed47656925656ed5ab..3dde6484d2eaa2d3f4300dabe9c0171abd3fd367 100644
--- a/res/res_http_post.c
+++ b/res/res_http_post.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>gmime</depend>
+	<support_level>core</support_level>
  ***/
 
 
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 61d436a9244a575c502e9f8312d32cacfd3aee45..46229520ac270e668ec6dad02b27fa51ce9e176f 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -33,6 +33,7 @@
 /*** MODULEINFO
 	<depend>iksemel</depend>
 	<use type="external">openssl</use>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_limit.c b/res/res_limit.c
index a6b4fef6440ac6745d142184ad150f5341ba6c74..dc07a4caf8d50b204709eefca9ad4244c2c6b367 100644
--- a/res/res_limit.c
+++ b/res/res_limit.c
@@ -18,6 +18,9 @@
  * \author Tilghman Lesher <res_limit_200607@the-tilghman.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
 
 #include "asterisk.h"
 
diff --git a/res/res_monitor.c b/res/res_monitor.c
index 86d1d1e02399de3d074724467d447128a13785a6..61dc4a2d0395149e149d304297d63c4626ba42ae 100644
--- a/res/res_monitor.c
+++ b/res/res_monitor.c
@@ -22,6 +22,10 @@
  *
  * \author Mark Spencer <markster@digium.com>
  */
+
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
  
 #include "asterisk.h"
 
@@ -650,6 +654,12 @@ static int start_monitor_exec(struct ast_channel *chan, const char *data)
 		AST_APP_ARG(fname_base);
 		AST_APP_ARG(options);
 	);
+	
+	/* Parse arguments. */
+	if (ast_strlen_zero(data)) {
+		ast_log(LOG_ERROR, "Monitor requires an argument\n");
+		return 0;
+	}
 
 	parse = ast_strdupa(data);
 	AST_STANDARD_APP_ARGS(args, parse);
@@ -665,9 +675,7 @@ static int start_monitor_exec(struct ast_channel *chan, const char *data)
 			stream_action &= ~X_REC_OUT;
 	}
 
-	if (args.format) {
-		arg = strchr(args.format, ':');
-	}
+	arg = strchr(args.format, ':');
 	if (arg) {
 		*arg++ = 0;
 		urlprefix = arg;
diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c
index cc98543c6e168909e64a9ed64036e3454d38f533..4a052d43da79edc32ccc38a078a6b179887f2385 100644
--- a/res/res_musiconhold.c
+++ b/res/res_musiconhold.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<conflict>win32</conflict>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_mutestream.c b/res/res_mutestream.c
index 41b2fd8310678080c1c85b6d3a06990ea8bf46da..92d01c7c7dfe1329076bb5f1ff909afa197a19e9 100644
--- a/res/res_mutestream.c
+++ b/res/res_mutestream.c
@@ -29,6 +29,10 @@
  * When we know and understands what happens if we zero out video, we can do that too.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision: 89545 $")
diff --git a/res/res_odbc.c b/res/res_odbc.c
index b1e72ac8d0774ffa273bae09dac3e4802b4d3788..1770bb303267abb08b0e74f797b247b9b5f5164b 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -33,6 +33,7 @@
 /*** MODULEINFO
 	<depend>generic_odbc</depend>
 	<depend>ltdl</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index 24d7b650512c5661591fd9becf883c70679dbabf..c6dc009eaa4a65a8c53484f908671c4a793397a1 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -26,6 +26,10 @@
  * \author Terry Wilson <twilson@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #include <sys/ioctl.h>
diff --git a/res/res_pktccops.c b/res/res_pktccops.c
index 33ecc38176d8190428bf01af3013eb7715ca6484..0572658ac8a452344d78277b3596e5ae49ea9e21 100644
--- a/res/res_pktccops.c
+++ b/res/res_pktccops.c
@@ -32,6 +32,7 @@
 
 /*** MODULEINFO
         <defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_realtime.c b/res/res_realtime.c
index 1bafe52b72f05bec7d2900f1bdacc84c793b3aa2..8b1488fe489f39e8ae35377a611de266c54ca0ca 100644
--- a/res/res_realtime.c
+++ b/res/res_realtime.c
@@ -27,6 +27,10 @@
  * \ingroup applications
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_rtp_asterisk.c b/res/res_rtp_asterisk.c
index 5948e664cded4fafdfd014bfe3a644aaaf3ba50e..a520cdb1668d33bd71a0883447fc7eb398894719 100644
--- a/res/res_rtp_asterisk.c
+++ b/res/res_rtp_asterisk.c
@@ -28,6 +28,10 @@
  * \ingroup rtp_engines
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_rtp_multicast.c b/res/res_rtp_multicast.c
index 0e930d61f3504ec15efec649c52b262290eaf150..18256e90e9e6428138419419c7d1ce44e53030dc 100644
--- a/res/res_rtp_multicast.c
+++ b/res/res_rtp_multicast.c
@@ -28,6 +28,10 @@
  * \ingroup rtp_engines
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_security_log.c b/res/res_security_log.c
index 2e3d4af52ac98ee74fd418c7f07bf334ac9a7004..3e8c48a24e73aed53db221b91cad7d5ae2d8cf78 100644
--- a/res/res_security_log.c
+++ b/res/res_security_log.c
@@ -27,6 +27,10 @@
  * \todo Escape quotes in string payload IE contents
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
diff --git a/res/res_smdi.c b/res/res_smdi.c
index 3c1ce4c97ae54b270f80c3e871dec43aeb567028..e0bde6959f8162c8d230f6adf2bb91c67a7558b4 100644
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -31,6 +31,10 @@
  * polling thread handle it.
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_snmp.c b/res/res_snmp.c
index 4bf81a2f06198e56d3ec48eef295f9ca354884b3..f717cead0ed753360c49d50f575dd2158db11068 100644
--- a/res/res_snmp.c
+++ b/res/res_snmp.c
@@ -19,6 +19,7 @@
 
 /*** MODULEINFO
 	<depend>netsnmp</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_speech.c b/res/res_speech.c
index 7a8d17e5aa8bdd370b32d6f7d4bf643d84239db8..de0c41e087ba3761fc4632bbd30cc90ea5439e13 100644
--- a/res/res_speech.c
+++ b/res/res_speech.c
@@ -23,6 +23,10 @@
  * \author Joshua Colp <jcolp@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
diff --git a/res/res_srtp.c b/res/res_srtp.c
index 3e9525afd5f198014b18a74e54aadf1f8017d553..223b79bbb52ad91d0b0123e956fdb2ca75427707 100644
--- a/res/res_srtp.c
+++ b/res/res_srtp.c
@@ -29,7 +29,8 @@
  */
 
 /*** MODULEINFO
-         <depend>srtp</depend>
+	<depend>srtp</depend>
+	<support_level>core</support_level>
 ***/
 
 /* See https://wiki.asterisk.org/wiki/display/AST/Secure+Calling */
diff --git a/res/res_stun_monitor.c b/res/res_stun_monitor.c
index 8ce77141d22f85185b20bf79e1af945b84599d4c..64ca73eda60bf6eed41d6bde07039e3fb0b35cb7 100644
--- a/res/res_stun_monitor.c
+++ b/res/res_stun_monitor.c
@@ -23,6 +23,10 @@
  * \author David Vossel <dvossel@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/res/res_timing_dahdi.c b/res/res_timing_dahdi.c
index 41f74f6c9f30a590040c32a1b906fc735bd619fd..61dda6a44c84e1e0a220f972c342992b4ef755f7 100644
--- a/res/res_timing_dahdi.c
+++ b/res/res_timing_dahdi.c
@@ -25,6 +25,7 @@
 
 /*** MODULEINFO
 	<depend>dahdi</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_timing_kqueue.c b/res/res_timing_kqueue.c
index 1fef5fb993d336d67519074dd1862111efec0df5..57091bf413d6ec0a2542013950be2ff320b41b6d 100644
--- a/res/res_timing_kqueue.c
+++ b/res/res_timing_kqueue.c
@@ -26,6 +26,7 @@
 /*** MODULEINFO
 	<depend>kqueue</depend>
 	<conflict>launchd</conflict>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/res/res_timing_pthread.c b/res/res_timing_pthread.c
index 8cb2898d9ef3820dc1e1dc78afbcaee79d6df636..e89ded2d674eab8cdaca50e4444d2a01b8adc03d 100644
--- a/res/res_timing_pthread.c
+++ b/res/res_timing_pthread.c
@@ -23,6 +23,10 @@
  * \brief pthread timing interface
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$");
diff --git a/res/res_timing_timerfd.c b/res/res_timing_timerfd.c
index ae5d2b411e51ef5aca67a41d3e06a4bc4bde7578..80e5ca8a59ecd49234436c16862aa9302ca63547 100644
--- a/res/res_timing_timerfd.c
+++ b/res/res_timing_timerfd.c
@@ -25,6 +25,7 @@
 
 /*** MODULEINFO
 	<depend>timerfd</depend>
+	<support_level>core</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_acl.c b/tests/test_acl.c
index 693c8054d766bd7b23e8ac5402c97455d247d78b..b84ca4364bfd6f17dbd443dd9b9e83d7c9d73374 100644
--- a/tests/test_acl.c
+++ b/tests/test_acl.c
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_amihooks.c b/tests/test_amihooks.c
index 2fd23a4768c266c793bd1f5f8ea6ef518833aec4..dfb64866bbc19c3e3a350792c5f45aa98c8f7f18 100644
--- a/tests/test_amihooks.c
+++ b/tests/test_amihooks.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_aoc.c b/tests/test_aoc.c
index 23663ee025266208928d50a6689bb9c162c5aac4..2a42943006cb7ed2b5ede5808d37a6cc2fd0b9e4 100644
--- a/tests/test_aoc.c
+++ b/tests/test_aoc.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_app.c b/tests/test_app.c
index b4b2c22e110da19e6e6f7e2dbb0a72fbea3560f8..75992f30f5c9eee865ad6b38bc40e7d38e4e30fe 100644
--- a/tests/test_app.c
+++ b/tests/test_app.c
@@ -26,6 +26,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_ast_format_str_reduce.c b/tests/test_ast_format_str_reduce.c
index c92245213cfc789115fb127de00f407df05b8b8d..6723513b8764a45233d0386154a729a13a00dafd 100644
--- a/tests/test_ast_format_str_reduce.c
+++ b/tests/test_ast_format_str_reduce.c
@@ -36,6 +36,7 @@
 	<depend>format_sln</depend>
 	<depend>format_wav</depend>
 	<depend>format_wav_gsm</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_astobj2.c b/tests/test_astobj2.c
index 12632c63afee0f65aa7f4b1c838394e4aa6eb7a3..9466f3384ccd7a965da22ef953ccae600713b068 100644
--- a/tests/test_astobj2.c
+++ b/tests/test_astobj2.c
@@ -25,6 +25,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_devicestate.c b/tests/test_devicestate.c
index 415cda2718452c8d049d5bcae9493c19797d93b2..77e718bd25468b030095c21a520eca6e323916d7 100644
--- a/tests/test_devicestate.c
+++ b/tests/test_devicestate.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_dlinklists.c b/tests/test_dlinklists.c
index 45a34eaf70105908eb7e8fac0cc88f454c0e0524..2af251f713f3e99e647e3671104aa8f5756bc626 100644
--- a/tests/test_dlinklists.c
+++ b/tests/test_dlinklists.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_event.c b/tests/test_event.c
index e6f345133bf9a7672d84d27fbc0e41698636e523..01bb9ee4cc3b150cf6c4fdf5f61266bc379925dc 100644
--- a/tests/test_event.c
+++ b/tests/test_event.c
@@ -44,6 +44,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_expr.c b/tests/test_expr.c
index b4adc4aacb4626800c3d2f67d1187743e4be39f6..b7f4164467782c7557038b2aec1f5c153402aca4 100644
--- a/tests/test_expr.c
+++ b/tests/test_expr.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_func_file.c b/tests/test_func_file.c
index 4e8823ba9381518fa868b851ac3980d7fef01377..6e35fe921a4166bd328509fbed9267af342bf593 100644
--- a/tests/test_func_file.c
+++ b/tests/test_func_file.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_gosub.c b/tests/test_gosub.c
index e69acfb17e341bed14e942e4fcb62cf706684e99..f8b7482fd4a2fece6debf346045130752e14bee1 100644
--- a/tests/test_gosub.c
+++ b/tests/test_gosub.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_heap.c b/tests/test_heap.c
index 3e70848d1ed404ab149a5505726528cc2d46e383..d14f1620f7eb281d5d5698f5d60cec6301f58f77 100644
--- a/tests/test_heap.c
+++ b/tests/test_heap.c
@@ -25,6 +25,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_locale.c b/tests/test_locale.c
index 46271c2326fb0e8817dbb09cd555c251fb8bbbe5..89148d17a0a86457e048dd822a5102d57a57a72a 100644
--- a/tests/test_locale.c
+++ b/tests/test_locale.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_logger.c b/tests/test_logger.c
index 04b5a10587ae9f8f100914f1e0091eaae1ab6ffb..41467ee6e95e139c41b80dc3ad2da3c3c9d7cee8 100644
--- a/tests/test_logger.c
+++ b/tests/test_logger.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_pbx.c b/tests/test_pbx.c
index 3ecc9e937e8dc08512e90a214ab9cc9d047a178a..a86ba36b8d467d868e08ac932bf1f587caff3a7e 100644
--- a/tests/test_pbx.c
+++ b/tests/test_pbx.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_poll.c b/tests/test_poll.c
index 815e0c6c46ee4028c8a8a93b3a98733e5a37adc4..bdab29142a50dc22f1ec27dc3187b7f346fec220 100644
--- a/tests/test_poll.c
+++ b/tests/test_poll.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_sched.c b/tests/test_sched.c
index 0062afb09024e7d7895b11331e0ae72a53432a91..bcd501aa004908adfebf719b2802e5900a8c4b1d 100644
--- a/tests/test_sched.c
+++ b/tests/test_sched.c
@@ -25,6 +25,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_security_events.c b/tests/test_security_events.c
index 33b40e87715631784708ddd681677cc30c1772af..c2c7c2921ccdbc34b3f17e29da8516da1fee75e1 100644
--- a/tests/test_security_events.c
+++ b/tests/test_security_events.c
@@ -25,6 +25,7 @@
 
 /*** MODULEINFO
 	<defaultenabled>no</defaultenabled>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_skel.c b/tests/test_skel.c
index 609e399a7090426ca7a79dedfa4711ee853977d6..98d604012a33213973249071a6bf65426cc4255c 100644
--- a/tests/test_skel.c
+++ b/tests/test_skel.c
@@ -28,6 +28,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_stringfields.c b/tests/test_stringfields.c
index dd3f0aaa131a83eb3690046680c06c37e290050f..2cd51ddae8fade3ef4b23d87f9c6bb1d5e42a6f0 100644
--- a/tests/test_stringfields.c
+++ b/tests/test_stringfields.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_strings.c b/tests/test_strings.c
index 34062f04df649f82d84c2e33680df0a65b3215ea..b1d1205e61a494a3b81bbce81681dc1944aa0f90 100644
--- a/tests/test_strings.c
+++ b/tests/test_strings.c
@@ -29,6 +29,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_substitution.c b/tests/test_substitution.c
index cb316169122589b9f9c00ec1728fcfb8b1b42cea..eb3bb54e278109efab4b42e1f622925ca761f932 100644
--- a/tests/test_substitution.c
+++ b/tests/test_substitution.c
@@ -28,6 +28,7 @@
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
 	<depend>func_curl</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_time.c b/tests/test_time.c
index c81c9bb120af87f37fab7426afe43a909a23f399..ae8834d943595f04068de0ca8f0f478442fad76b 100644
--- a/tests/test_time.c
+++ b/tests/test_time.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/tests/test_utils.c b/tests/test_utils.c
index fd9d3bc4a8d95ad8f8c497ce91dc99dba19f684e..3e7df97e2a1fef4c025a21bbf576d74b633ad608 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -27,6 +27,7 @@
 
 /*** MODULEINFO
 	<depend>TEST_FRAMEWORK</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/ael_main.c b/utils/ael_main.c
index e5a7346edb2977c4f55a1a68eebe8cb7a140aa19..52aa47993300d28f364580df8ceab5c69d49a4fd 100644
--- a/utils/ael_main.c
+++ b/utils/ael_main.c
@@ -6,6 +6,11 @@
  *   it was copied from;
  * - fixing the formatting
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #include <locale.h>
diff --git a/utils/astcanary.c b/utils/astcanary.c
index 8cfa3feb73619ed6203a377c11e8bb24b197b726..9432c57a7dbac8a8d1dba2f82b7d236ff3122da2 100644
--- a/utils/astcanary.c
+++ b/utils/astcanary.c
@@ -16,6 +16,10 @@
  * at the top of the source tree.
  */
 
+/*** MODULEINFO
+	<support_level>core</support_level>
+ ***/
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
diff --git a/utils/astman.c b/utils/astman.c
index 6bb4c4c6f894aed57f472cab57922fa4cad71f65..459eeee71b4d57e1657d2a3f7e053d7b7ace0827 100644
--- a/utils/astman.c
+++ b/utils/astman.c
@@ -22,6 +22,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk.h"
diff --git a/utils/check_expr.c b/utils/check_expr.c
index b904b482464672a896089f7e8f2ff6f0c91f7f0d..556b0f9f8e5373ab73ab9fd2525a5ce44de7933d 100644
--- a/utils/check_expr.c
+++ b/utils/check_expr.c
@@ -16,6 +16,10 @@
  * at the top of the source tree.
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
diff --git a/utils/conf2ael.c b/utils/conf2ael.c
index 538818b2509bb4e9dbafd23eeaf34f9529989e6a..020dbe3af9a79358fbe9e42073cae24859b37d90 100644
--- a/utils/conf2ael.c
+++ b/utils/conf2ael.c
@@ -24,6 +24,7 @@
 
 /*** MODULEINFO
 	<depend>res_ael_share</depend>
+	<support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
diff --git a/utils/extconf.c b/utils/extconf.c
index 22df962e7e316d058e0921a4da31c4af17920ede..54e11a0ad5167eb03c7ee3598438718b80e6f168 100644
--- a/utils/extconf.c
+++ b/utils/extconf.c
@@ -23,6 +23,11 @@
  * for operations outside of asterisk. A huge, awful hack.
  *
  */
+
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #undef DEBUG_THREADS
diff --git a/utils/hashtest.c b/utils/hashtest.c
index 9ec597f4e7ecf5388e9fb06b4e8fbca718e5df3a..390e331e02d3d6f533048a0e38fca3b05ff47184 100644
--- a/utils/hashtest.c
+++ b/utils/hashtest.c
@@ -28,6 +28,10 @@
  *  \author Steve Murphy <murf@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
diff --git a/utils/hashtest2.c b/utils/hashtest2.c
index 7953decf6613f047409a3a397331cb5e88583992..5bc62806159ad0647b2f4b2074923cbf47e7011b 100644
--- a/utils/hashtest2.c
+++ b/utils/hashtest2.c
@@ -28,6 +28,10 @@
  *  \author Steve Murphy <murf@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
diff --git a/utils/muted.c b/utils/muted.c
index 211766e531bb619d7e3f95e054ebd621cf35c13d..18f55d73f879d81fda803216765c790c41c94fd0 100644
--- a/utils/muted.c
+++ b/utils/muted.c
@@ -35,6 +35,10 @@
  *
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk/autoconfig.h"
 
 #ifdef __Darwin__
diff --git a/utils/refcounter.c b/utils/refcounter.c
index 1c679e8221460bd868eeace48d8f05e84b72da0b..b45680e0d35bcd3b6a2e383a886368985dd22699 100644
--- a/utils/refcounter.c
+++ b/utils/refcounter.c
@@ -39,6 +39,10 @@
  *  \author Steve Murphy <murf@digium.com>
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
diff --git a/utils/smsq.c b/utils/smsq.c
index c6aaff8e21ca453c6a841ceeeafb03ef0408997f..fab32f086254df45bb2329c380e99057131c345f 100644
--- a/utils/smsq.c
+++ b/utils/smsq.c
@@ -17,6 +17,10 @@
  * at the top of the source tree.
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include "asterisk.h"
 
 #include <popt.h>
diff --git a/utils/stereorize.c b/utils/stereorize.c
index 31f1b1fbed1ad8275ebb507673eead7834c33e68..4843040373a81973dd1ca2d776c5938494733374 100644
--- a/utils/stereorize.c
+++ b/utils/stereorize.c
@@ -10,6 +10,10 @@
  *
  ****************************************************************************/
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/utils/streamplayer.c b/utils/streamplayer.c
index ebb12e54bdd6bc64ee199e82171861264f54e944..6c70b0840a0751298edb93f079661360be941e20 100644
--- a/utils/streamplayer.c
+++ b/utils/streamplayer.c
@@ -42,6 +42,10 @@
  * not work.  :)
  */
 
+/*** MODULEINFO
+	<support_level>extended</support_level>
+ ***/
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>