From a525edea595a782bcc3f868703ee85c794728614 Mon Sep 17 00:00:00 2001
From: Leif Madsen <leif@leifmadsen.com>
Date: Thu, 14 Jul 2011 20:28:54 +0000
Subject: [PATCH] Merged revisions 328247 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328247 | lmadsen | 2011-07-14 16:25:31 -0400 (Thu, 14 Jul 2011) | 14 lines

  Merged revisions 328209 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r328209 | lmadsen | 2011-07-14 16:13:06 -0400 (Thu, 14 Jul 2011) | 6 lines

    Introduce <support_level> tags in MODULEINFO.
    This change introduces MODULEINFO into many modules in Asterisk in order to show
    the community support level for those modules. This is used by changes committed
    to menuselect by Russell Bryant recently (r917 in menuselect). More information about
    the support level types and what they mean is available on the wiki at
    https://wiki.asterisk.org/wiki/display/AST/Asterisk+Module+Support+States
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@328259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 addons/app_mysql.c                 |  2 ++
 addons/app_saycountpl.c            |  2 ++
 addons/cdr_mysql.c                 |  2 ++
 addons/chan_mobile.c               |  1 +
 addons/chan_ooh323.c               |  1 +
 addons/format_mp3.c                |  1 +
 addons/res_config_mysql.c          |  1 +
 agi/eagi-test.c                    |  4 ++++
 apps/app_adsiprog.c                |  1 +
 apps/app_alarmreceiver.c           |  4 ++++
 apps/app_amd.c                     |  3 +++
 apps/app_authenticate.c            |  4 ++++
 apps/app_cdr.c                     |  4 ++++
 apps/app_chanisavail.c             |  4 ++++
 apps/app_channelredirect.c         |  4 ++++
 apps/app_chanspy.c                 |  4 ++++
 apps/app_confbridge.c              |  4 ++++
 apps/app_controlplayback.c         |  4 ++++
 apps/app_dahdibarge.c              |  3 +++
 apps/app_dahdiras.c                |  1 +
 apps/app_db.c                      |  4 ++++
 apps/app_dial.c                    |  1 +
 apps/app_dictate.c                 |  4 ++++
 apps/app_directed_pickup.c         |  4 ++++
 apps/app_directory.c               |  1 +
 apps/app_disa.c                    |  4 ++++
 apps/app_dumpchan.c                |  4 ++++
 apps/app_echo.c                    |  4 ++++
 apps/app_exec.c                    |  3 +++
 apps/app_externalivr.c             |  4 ++++
 apps/app_fax.c                     |  1 +
 apps/app_festival.c                |  4 ++++
 apps/app_flash.c                   |  1 +
 apps/app_followme.c                |  1 +
 apps/app_forkcdr.c                 |  4 ++++
 apps/app_getcpeid.c                |  4 ++++
 apps/app_ices.c                    |  4 ++++
 apps/app_image.c                   |  4 ++++
 apps/app_ivrdemo.c                 |  1 +
 apps/app_jack.c                    |  1 +
 apps/app_macro.c                   |  6 ++++++
 apps/app_meetme.c                  |  3 +++
 apps/app_milliwatt.c               |  4 ++++
 apps/app_minivm.c                  |  4 ++++
 apps/app_mixmonitor.c              |  4 ++++
 apps/app_morsecode.c               |  4 ++++
 apps/app_mp3.c                     |  4 ++++
 apps/app_nbscat.c                  |  4 ++++
 apps/app_originate.c               |  4 ++++
 apps/app_osplookup.c               |  1 +
 apps/app_page.c                    |  1 +
 apps/app_parkandannounce.c         |  4 ++++
 apps/app_playback.c                |  6 +++++-
 apps/app_playtones.c               |  4 ++++
 apps/app_privacy.c                 |  4 ++++
 apps/app_queue.c                   |  1 +
 apps/app_read.c                    |  4 ++++
 apps/app_readexten.c               |  4 ++++
 apps/app_readfile.c                |  6 ++++++
 apps/app_record.c                  |  4 ++++
 apps/app_rpt.c                     |  1 +
 apps/app_saycounted.c              |  1 +
 apps/app_sayunixtime.c             |  4 ++++
 apps/app_senddtmf.c                |  4 ++++
 apps/app_sendtext.c                |  4 ++++
 apps/app_setcallerid.c             |  8 +++++++-
 apps/app_skel.c                    |  1 +
 apps/app_sms.c                     |  4 ++++
 apps/app_softhangup.c              |  4 ++++
 apps/app_speech_utils.c            |  4 ++++
 apps/app_stack.c                   |  1 +
 apps/app_talkdetect.c              |  6 +++++-
 apps/app_test.c                    |  4 ++++
 apps/app_transfer.c                |  4 ++++
 apps/app_url.c                     |  4 ++++
 apps/app_userevent.c               |  4 ++++
 apps/app_verbose.c                 |  4 ++++
 apps/app_voicemail.c               |  1 +
 apps/app_waitforring.c             |  4 ++++
 apps/app_waitforsilence.c          |  4 ++++
 apps/app_waituntil.c               |  4 ++++
 apps/app_while.c                   |  4 ++++
 apps/app_zapateller.c              |  4 ++++
 bridges/bridge_builtin_features.c  |  4 ++++
 bridges/bridge_multiplexed.c       |  4 ++++
 bridges/bridge_simple.c            |  4 ++++
 bridges/bridge_softmix.c           |  4 ++++
 cdr/cdr_adaptive_odbc.c            |  1 +
 cdr/cdr_csv.c                      |  4 ++++
 cdr/cdr_custom.c                   |  4 ++++
 cdr/cdr_manager.c                  |  4 ++++
 cdr/cdr_odbc.c                     |  1 +
 cdr/cdr_pgsql.c                    |  1 +
 cdr/cdr_radius.c                   |  1 +
 cdr/cdr_sqlite.c                   |  3 +++
 cdr/cdr_sqlite3_custom.c           |  1 +
 cdr/cdr_syslog.c                   |  3 ++-
 cdr/cdr_tds.c                      |  1 +
 cel/cel_custom.c                   |  4 ++++
 cel/cel_manager.c                  |  4 ++++
 cel/cel_odbc.c                     |  1 +
 cel/cel_pgsql.c                    |  1 +
 cel/cel_radius.c                   |  1 +
 cel/cel_sqlite3_custom.c           |  1 +
 cel/cel_tds.c                      |  1 +
 channels/chan_agent.c              |  1 +
 channels/chan_alsa.c               |  1 +
 channels/chan_bridge.c             |  4 ++++
 channels/chan_console.c            |  1 +
 channels/chan_dahdi.c              |  1 +
 channels/chan_gtalk.c              |  1 +
 channels/chan_h323.c               |  4 +++-
 channels/chan_iax2.c               |  1 +
 channels/chan_jingle.c             |  2 ++
 channels/chan_local.c              |  4 ++++
 channels/chan_mgcp.c               |  1 +
 channels/chan_misdn.c              |  1 +
 channels/chan_multicast_rtp.c      |  4 ++++
 channels/chan_nbs.c                |  1 +
 channels/chan_oss.c                |  1 +
 channels/chan_phone.c              |  1 +
 channels/chan_sip.c                |  1 +
 channels/chan_skinny.c             |  3 +++
 channels/chan_unistim.c            |  4 ++++
 channels/chan_usbradio.c           |  1 +
 channels/chan_vpb.cc               |  2 ++
 codecs/codec_a_mu.c                |  4 ++++
 codecs/codec_adpcm.c               |  4 ++++
 codecs/codec_alaw.c                |  4 ++++
 codecs/codec_g722.c                |  4 ++++
 codecs/codec_g726.c                |  4 ++++
 codecs/codec_gsm.c                 |  1 +
 codecs/codec_ilbc.c                |  1 +
 codecs/codec_lpc10.c               |  4 ++++
 codecs/codec_resample.c            |  5 +++++
 codecs/codec_speex.c               |  1 +
 codecs/codec_ulaw.c                |  4 ++++
 formats/format_g719.c              |  4 ++++
 formats/format_g723.c              |  4 ++++
 formats/format_g726.c              |  4 ++++
 formats/format_g729.c              |  4 ++++
 formats/format_gsm.c               |  4 ++++
 formats/format_h263.c              |  4 ++++
 formats/format_h264.c              |  4 ++++
 formats/format_ilbc.c              |  4 ++++
 formats/format_jpeg.c              |  4 ++++
 formats/format_ogg_vorbis.c        |  1 +
 formats/format_pcm.c               |  4 ++++
 formats/format_siren14.c           |  4 ++++
 formats/format_siren7.c            |  4 ++++
 formats/format_sln.c               |  4 ++++
 formats/format_vox.c               |  4 ++++
 formats/format_wav.c               |  4 ++++
 formats/format_wav_gsm.c           |  4 ++++
 funcs/func_aes.c                   |  1 +
 funcs/func_audiohookinherit.c      |  4 ++++
 funcs/func_base64.c                |  4 ++++
 funcs/func_blacklist.c             |  4 ++++
 funcs/func_callcompletion.c        |  4 ++++
 funcs/func_callerid.c              |  4 ++++
 funcs/func_cdr.c                   |  4 ++++
 funcs/func_channel.c               |  4 ++++
 funcs/func_config.c                |  4 ++++
 funcs/func_curl.c                  |  1 +
 funcs/func_cut.c                   |  4 ++++
 funcs/func_db.c                    |  4 ++++
 funcs/func_devstate.c              |  4 ++++
 funcs/func_dialgroup.c             |  4 ++++
 funcs/func_dialplan.c              |  4 ++++
 funcs/func_enum.c                  |  4 ++++
 funcs/func_env.c                   |  4 ++++
 funcs/func_extstate.c              |  4 ++++
 funcs/func_frame_trace.c           |  4 ++++
 funcs/func_global.c                |  4 ++++
 funcs/func_groupcount.c            |  4 ++++
 funcs/func_iconv.c                 |  3 ++-
 funcs/func_lock.c                  |  4 ++++
 funcs/func_logic.c                 |  4 ++++
 funcs/func_math.c                  |  4 ++++
 funcs/func_md5.c                   |  4 ++++
 funcs/func_module.c                |  5 +++++
 funcs/func_odbc.c                  |  1 +
 funcs/func_pitchshift.c            |  4 ++++
 funcs/func_rand.c                  |  4 ++++
 funcs/func_sha1.c                  |  4 ++++
 funcs/func_shell.c                 |  4 ++++
 funcs/func_speex.c                 |  1 +
 funcs/func_sprintf.c               |  4 ++++
 funcs/func_srv.c                   |  4 ++++
 funcs/func_strings.c               |  4 ++++
 funcs/func_sysinfo.c               |  4 ++++
 funcs/func_timeout.c               |  4 ++++
 funcs/func_uri.c                   |  4 ++++
 funcs/func_version.c               |  4 ++++
 funcs/func_vmcount.c               |  4 ++++
 funcs/func_volume.c                |  4 ++++
 main/features.c                    |  4 ++++
 main/http.c                        |  4 ++++
 main/manager.c                     |  4 ++++
 pbx/pbx_ael.c                      |  1 +
 pbx/pbx_config.c                   |  4 ++++
 pbx/pbx_dundi.c                    |  1 +
 pbx/pbx_loopback.c                 |  4 ++++
 pbx/pbx_lua.c                      |  1 +
 pbx/pbx_realtime.c                 |  4 ++++
 pbx/pbx_spool.c                    |  4 ++++
 res/res_adsi.c                     |  4 ++++
 res/res_ael_share.c                |  4 ++++
 res/res_agi.c                      |  4 ++++
 res/res_ais.c                      |  1 +
 res/res_calendar.c                 |  4 ++++
 res/res_calendar_caldav.c          |  2 ++
 res/res_calendar_ews.c             |  2 ++
 res/res_calendar_exchange.c        |  2 ++
 res/res_calendar_icalendar.c       |  2 ++
 res/res_clialiases.c               |  3 +++
 res/res_clioriginate.c             |  4 ++++
 res/res_config_curl.c              |  1 +
 res/res_config_ldap.c              |  1 +
 res/res_config_odbc.c              |  1 +
 res/res_config_pgsql.c             |  1 +
 res/res_config_sqlite.c            |  1 +
 res/res_convert.c                  |  4 ++++
 res/res_crypto.c                   |  1 +
 res/res_fax.c                      |  4 ++++
 res/res_fax_spandsp.c              |  1 +
 res/res_http_post.c                |  1 +
 res/res_jabber.c                   |  1 +
 res/res_limit.c                    |  3 +++
 res/res_monitor.c                  | 14 +++++++++++---
 res/res_musiconhold.c              |  1 +
 res/res_mutestream.c               |  4 ++++
 res/res_odbc.c                     |  1 +
 res/res_phoneprov.c                |  4 ++++
 res/res_pktccops.c                 |  1 +
 res/res_realtime.c                 |  4 ++++
 res/res_rtp_asterisk.c             |  4 ++++
 res/res_rtp_multicast.c            |  4 ++++
 res/res_security_log.c             |  4 ++++
 res/res_smdi.c                     |  4 ++++
 res/res_snmp.c                     |  1 +
 res/res_speech.c                   |  4 ++++
 res/res_srtp.c                     |  3 ++-
 res/res_stun_monitor.c             |  4 ++++
 res/res_timing_dahdi.c             |  1 +
 res/res_timing_kqueue.c            |  1 +
 res/res_timing_pthread.c           |  4 ++++
 res/res_timing_timerfd.c           |  1 +
 tests/test_acl.c                   |  1 +
 tests/test_amihooks.c              |  1 +
 tests/test_aoc.c                   |  1 +
 tests/test_app.c                   |  1 +
 tests/test_ast_format_str_reduce.c |  1 +
 tests/test_astobj2.c               |  1 +
 tests/test_devicestate.c           |  1 +
 tests/test_dlinklists.c            |  1 +
 tests/test_event.c                 |  1 +
 tests/test_expr.c                  |  1 +
 tests/test_func_file.c             |  1 +
 tests/test_gosub.c                 |  1 +
 tests/test_heap.c                  |  1 +
 tests/test_locale.c                |  1 +
 tests/test_logger.c                |  1 +
 tests/test_pbx.c                   |  1 +
 tests/test_poll.c                  |  1 +
 tests/test_sched.c                 |  1 +
 tests/test_security_events.c       |  1 +
 tests/test_skel.c                  |  1 +
 tests/test_stringfields.c          |  1 +
 tests/test_strings.c               |  1 +
 tests/test_substitution.c          |  1 +
 tests/test_time.c                  |  1 +
 tests/test_utils.c                 |  1 +
 utils/ael_main.c                   |  5 +++++
 utils/astcanary.c                  |  4 ++++
 utils/astman.c                     |  4 ++++
 utils/check_expr.c                 |  4 ++++
 utils/conf2ael.c                   |  1 +
 utils/extconf.c                    |  5 +++++
 utils/hashtest.c                   |  4 ++++
 utils/hashtest2.c                  |  4 ++++
 utils/muted.c                      |  4 ++++
 utils/refcounter.c                 |  4 ++++
 utils/smsq.c                       |  4 ++++
 utils/stereorize.c                 |  4 ++++
 utils/streamplayer.c               |  4 ++++
 286 files changed, 834 insertions(+), 10 deletions(-)

diff --git a/addons/app_mysql.c b/addons/app_mysql.c
index 589b238237..5649166a72 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 9157798996..b4441f24ff 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 60abae2d95..ecdfaea0bd 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 5495c7f227..7c14927298 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 552b8f22cc..32d1cf7d4f 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 d59411d6cb..5584f3e061 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 eaf7209f93..d393de6c16 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 dc2d7fa1ab..7f24d1f23d 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 c138f04296..430d8258d6 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 6936cb5a0d..1a4f9220fa 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 7c4e2a47a8..35c5005f7d 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 416ea432d6..8b5fa11a62 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 70036ad825..2f227b0490 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 5dd4a1f603..86ce34177b 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 57c9234ef3..8fe543dab1 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 c90a7907a4..92e0ba5130 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 0ca2c6e8dd..4897d065eb 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 bbeea30376..1e2e6fbc20 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 082405e80e..bb0120cbc8 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 b467b16b8b..fbaf984505 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 99679e71b0..1fa24088e0 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 d3b8009de6..f144d48ea2 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 5bf439d160..b50fbb0448 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 63a7621ff8..c2bdf51318 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 8451eea083..dccae948b9 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 20c9ce48ca..3ca0800096 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 f9e6572014..0a9fa68887 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 ab991427dd..48e6714e21 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 2a4da1e2f2..ab9a9aecef 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 258a1e5c75..4eb99c1bbe 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 0d59dfa3a3..e2085cbbb1 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 a30302fa7b..d609b3fe45 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 dedadfeabb..3273b5b0a1 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 7ed8749286..a72ef307a5 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 12d5049140..ffeeca8ece 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 2207081568..7f59976eb2 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 7293753131..52c03ae09e 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 af4abd7e98..160a285697 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 a9c61209ac..d035df91f9 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 07ab8da793..893a5dec0a 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 aecc0327eb..3bbfe20d6b 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 40f5b0ee44..73aaefc0e6 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 26cba3c40f..dc37e7e896 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 124a04d4f7..3445b7ec6b 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 05798ffa33..c263b14451 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 a234cd431b..67e242f7be 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 f8c5a05781..922d42a5b4 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 2bbde630e1..0936534953 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 bc811d958b..5cfd413867 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 239d6d501d..9dbf39752a 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 656dcf5715..cf21014467 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 fb3e713e13..70633745bc 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 1e198470e6..ea4d90b19d 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 c9c0fbb99a..1e142de232 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 6a6c1a4378..6b191771c8 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 9442ce6495..fdb36fed1d 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 a5e4a64342..813d375654 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 5e8159b359..94dc1e1f87 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 8c3bcae64d..d031406c20 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 a192b1adc1..6098ca7290 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 990f05423f..f37083695a 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 c840d8bb0d..be3ac65ef1 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 55afdf4638..fc1b238dd8 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 2af67a299a..5c8425a0f3 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 2624fe505b..a723de5b9e 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 666e46ff4e..cfcd2b47de 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 c58d451e40..bd3b546e00 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 07af71d1cd..e3f8c5260b 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 1c880b4e8b..cdfd7c147d 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 fe99157e95..637aac613a 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 10a1af48d1..c5f0b6affb 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 545261c72f..9eb800287a 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 7d0214a59a..32b6fc02b6 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 ad6e8011e9..f072eb27f5 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 533c11212b..f33890c76a 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 1e1e4a9cd1..59bea65df6 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 85f79f892d..ca1a010cc3 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 1f72ee1d97..764a445206 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 7ddc9db12b..bd0353b074 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 fe4b1e14dc..a920e11a86 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 04905edc51..d1f4bb103a 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 80359359e1..45bd655944 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 6af9b963c6..b102ea4260 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 2b21933e2c..802e9ae30a 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 5a3de43d8b..e004dfd405 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 72b91087ad..14864df4d7 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 00b0556d05..7632f36ee6 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 db19896f21..cb9bd0d529 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 60b9658808..068b7a9a2f 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 c834814e81..6a2751d1f2 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 4cc8183656..d5106b1588 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 f77d60b2c2..45f8bca795 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 826b09f3f1..e857baa87a 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 bf613284dc..140e7a01c0 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 2dcdf96a40..47d1a5192b 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 c2dae7a7bc..97d1a309ec 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 63545208eb..b6fc90e0dd 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 fca815fd83..eead023fb0 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 9f7d589b49..54b1e4f5ed 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 fcf20766f9..551b861d05 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 d298f1ba2f..f0c70f53c5 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 62438d8567..4a67edd85d 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 f5ccb5f8a9..7cd7726e1f 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 18e2a9f1a3..2906ed9ee9 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 37992bf5e8..f5686c9b0c 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 0dc930f9da..044524669e 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 b1e7c30e55..b51c942af3 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 7b01909ae8..36f23a500c 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 a5f22be2dc..a0eddbeae3 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 b94889ef41..079831340e 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 326cb69dba..a15fca975b 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 07646652f5..e90bee18c3 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 9f5f32deb6..dff1bfda21 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 53b1a85e40..86a6410db1 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 3c16fc51a0..937ede4c22 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 bd92fe9b0e..dfd5a310f3 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 d6e10aebe2..e9fa800106 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 b398abb213..929525ffb1 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 fdfbd8eb3a..3ff97dde78 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 67c55c592d..a8ca79a3ee 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 4b7ec9721d..6acb7a1847 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 2e7b6f7f94..fec843627f 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 ea7d16c9e3..80338c7d02 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 f4b92330ea..8f0cfa59e4 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 925629f850..62a26de7f6 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 0215ab82f5..b4e9858ee9 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 a7d86e2c4c..470f363e7d 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 63745c1704..96e19f0d3c 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 3d2fc92aec..34a71388eb 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 9c3a018468..89641f1751 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 f8a57f740e..d92b9b6422 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 46c1c84fb8..f42a5f1bd5 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 7229b434d6..ac6ccbb43f 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 7d1739203f..5f2047a3fd 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 66ef584bd7..a3e7d6f267 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 6554ee000a..d298f23793 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 b5211a585a..86a0706c40 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 b679122f87..aace0edc73 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 6dab66a860..7eba741475 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 73a57c8eef..636aff091b 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 22b3c3282d..042977728c 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 26257c39fb..03419c2f61 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 76555a67c9..77c1229c38 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 ea82454f35..155f469759 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 a60b585d71..7a08ca515c 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 99de8dac1b..d6733020ec 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 949a13f78b..46056b8948 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 ec628c5b30..3bf27388c6 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 53c9ea9221..1ce50fad4b 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 16eca5df59..2e5182d3c6 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 91cb4584af..1a73cdfbbf 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 05ecdeeaff..7d34df99cb 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 f35fd52787..f311522e5f 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 ae1f11ed8d..35d4339f96 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 891106b6f3..c176f48635 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 528aed51fb..59faa90198 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 274e291cec..1a7619d916 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 b940b5891b..be3bbc5fbd 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 b3fab310f4..cee06faa47 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 a653d8660c..bb631fe4ea 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 3d0c846f96..34fdd6736e 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 202036e84f..7baf2485ef 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 21d291c2e5..cbc51aaae6 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 24f6fd923f..7e97eb56eb 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 10bca0a9f1..762dd61fe1 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 a932cf5b15..20c8829a61 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 396657768c..274f1ac039 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 b1fa78017a..4a789d627d 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 4e1ab3bed4..c39b3e3766 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 d8c8b252d7..cc4d47a789 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 aa0abb4b33..c7b431dca8 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 d3c7ba4b71..940c455c28 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 03711ee7d7..681f151fc5 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 a501aee58d..6b158aafbb 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 70c3964363..609d01fefa 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 231b4880f2..4c4f65f1ac 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 27d199e367..c3cf7a9872 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 27734ed784..21f08a13f5 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 f3a690c5d6..e7217c7b3d 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 7c61d9f8cc..2e60185864 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 44ec08e4db..b0b3461169 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 fad548a92e..6cef946dfd 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 b14894712f..ca441f9850 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 2d4e02fcf4..6491b371de 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 985e11a383..c6b7575454 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 df7164d5f5..1f274b83d5 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 e17e8ca9c0..2b29271f33 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 4e3fbb99cf..4d5fc7a6c0 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 de48f0d063..deb94835fa 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 0d2b95efc3..055fd0c4e0 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 2d9a8dd24e..a7e358bb83 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 79d908d187..53bbab7531 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 ecf23d8ff6..f4ecf3d67b 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 8ed6c218f5..d8ba757a40 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 f409e75cee..c4d80d499e 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 938fbba38a..806564beee 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 06ec1b698e..7f8444c174 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 63d91c2b2a..724a58fdcf 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 edaad357fd..98daad0843 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 96c65ff6d0..94a6212fa4 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 e02ef9de6b..f0da2e87ae 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 26418d760e..f2f556915a 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 e283127a08..915a0cb10a 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 cae82adba5..c1088629bf 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 f183c867b0..51254a8715 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 b908663571..b45ff6a591 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 0a1f623a5a..7787524957 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 805dfd9a83..f1ae9f33f5 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 b57c498df5..87ae21a6df 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 9bcceeade9..c64e8e6742 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 e6b724bafc..b775537817 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 dd150afd6c..14fce0ca7e 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 31df353121..51761127eb 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 2238124db4..4a2df1822c 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 d503eac35a..8ef269e4f3 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 e2558f2748..d67f3ba39b 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 f244c165dc..8a30be0735 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 8488d9bdc1..bb8d9b39ba 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 adfdacb28d..55e1526d53 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 f52f941be9..86cc25c86e 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 bbc683a478..6ed6bd294f 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 75d353cd55..fbeeac2750 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 94d6e1e59c..c2966a85f2 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 e25b8a4d6d..4ae0851d69 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 31aede8a65..8073f2d6e9 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 02657583d4..296dd07a63 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 c0719b6dab..3dde6484d2 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 61d436a924..46229520ac 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 a6b4fef644..dc07a4caf8 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 86d1d1e023..61dc4a2d03 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 cc98543c6e..4a052d43da 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 41b2fd8310..92d01c7c7d 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 b1e72ac8d0..1770bb3032 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 24d7b65051..c6dc009eaa 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 33ecc38176..0572658ac8 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 1bafe52b72..8b1488fe48 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 5948e664cd..a520cdb166 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 0e930d61f3..18256e90e9 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 2e3d4af52a..3e8c48a24e 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 3c1ce4c97a..e0bde6959f 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 4bf81a2f06..f717cead0e 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 7a8d17e5aa..de0c41e087 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 3e9525afd5..223b79bbb5 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 8ce77141d2..64ca73eda6 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 41f74f6c9f..61dda6a44c 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 1fef5fb993..57091bf413 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 8cb2898d9e..e89ded2d67 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 ae5d2b411e..80e5ca8a59 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 693c8054d7..b84ca4364b 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 2fd23a4768..dfb64866bb 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 23663ee025..2a42943006 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 b4b2c22e11..75992f30f5 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 c92245213c..6723513b87 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 12632c63af..9466f3384c 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 415cda2718..77e718bd25 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 45a34eaf70..2af251f713 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 e6f345133b..01bb9ee4cc 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 b4adc4aacb..b7f4164467 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 4e8823ba93..6e35fe921a 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 e69acfb17e..f8b7482fd4 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 3e70848d1e..d14f1620f7 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 46271c2326..89148d17a0 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 04b5a10587..41467ee6e9 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 3ecc9e937e..a86ba36b8d 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 815e0c6c46..bdab29142a 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 0062afb090..bcd501aa00 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 33b40e8771..c2c7c2921c 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 609e399a70..98d604012a 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 dd3f0aaa13..2cd51ddae8 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 34062f04df..b1d1205e61 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 cb31616912..eb3bb54e27 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 c81c9bb120..ae8834d943 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 fd9d3bc4a8..3e7df97e2a 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 e5a7346edb..52aa479933 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 8cfa3feb73..9432c57a7d 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 6bb4c4c6f8..459eeee71b 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 b904b48246..556b0f9f8e 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 538818b250..020dbe3af9 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 22df962e7e..54e11a0ad5 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 9ec597f4e7..390e331e02 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 7953decf66..5bc6280615 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 211766e531..18f55d73f8 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 1c679e8221..b45680e0d3 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 c6aaff8e21..fab32f0862 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 31f1b1fbed..4843040373 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 ebb12e54bd..6c70b0840a 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>
-- 
GitLab