Index: channels/chan_h323.c
===================================================================
--- channels/chan_h323.c	(revision 313649)
+++ channels/chan_h323.c	(working copy)
@@ -36,7 +36,7 @@
 
 /*** MODULEINFO
 	<depend>openh323</depend>
-	<defaultenabled>yes</defaultenabled>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #ifdef __cplusplus
@@ -3433,7 +3433,7 @@
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "The NuFone Network's OpenH323 Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "The NuFone Network's OpenH323 Channel Driver (UNSUPPORTED) -- see chan_ooh323",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
Index: apps/app_db.c
===================================================================
--- apps/app_db.c	(revision 313649)
+++ apps/app_db.c	(working copy)
@@ -39,6 +39,10 @@
 #include "asterisk/astdb.h"
 #include "asterisk/lock.h"
 
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+ ***/
+
 /*** DOCUMENTATION
 	<application name="DBdel" language="en_US">
 		<synopsis>
@@ -162,4 +166,4 @@
 	return retval;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Database Access Functions");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Database Access Functions (UNSUPPORTED) -- see func_db");
Index: apps/app_setcallerid.c
===================================================================
--- apps/app_setcallerid.c	(revision 313649)
+++ apps/app_setcallerid.c	(working copy)
@@ -38,6 +38,10 @@
 #include "asterisk/image.h"
 #include "asterisk/callerid.h"
 
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+ ***/
+
 /*** DOCUMENTATION
 	<application name="SetCallerPres" language="en_US">
 		<synopsis>
@@ -121,4 +125,4 @@
 	return ast_register_application_xml(app2, setcallerid_pres_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Set CallerID Presentation Application");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Set CallerID Presentation Application (UNSUPPORTED) -- see func_callerid");
Index: apps/app_readfile.c
===================================================================
--- apps/app_readfile.c	(revision 313649)
+++ apps/app_readfile.c	(working copy)
@@ -35,6 +35,10 @@
 #include "asterisk/app.h"
 #include "asterisk/module.h"
 
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+ ***/
+
 /*** DOCUMENTATION
 	<application name="ReadFile" language="en_US">
 		<synopsis>
@@ -125,4 +129,4 @@
 	return ast_register_application_xml(app_readfile, readfile_exec);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Stores output of file into a variable");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Stores output of file into a variable (UNSUPPORTED) -- see func_env");
Index: apps/app_macro.c
===================================================================
--- apps/app_macro.c	(revision 313649)
+++ apps/app_macro.c	(working copy)
@@ -38,6 +38,10 @@
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
 
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+ ***/
+
 /*** DOCUMENTATION
 	<application name="Macro" language="en_US">
 		<synopsis>
@@ -640,4 +644,4 @@
 	return res;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Extension Macros");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Extension Macros (UNSUPPORTED) -- see app_stack");
Index: apps/app_dahdibarge.c
===================================================================
--- apps/app_dahdibarge.c	(revision 313649)
+++ apps/app_dahdibarge.c	(working copy)
@@ -33,6 +33,7 @@
 
 /*** MODULEINFO
 	<depend>dahdi</depend>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"
@@ -305,4 +306,4 @@
 	return ((ast_register_application_xml(app, conf_exec)) ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_SUCCESS);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Barge in on DAHDI channel application");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Barge in on DAHDI channel application (UNSUPPORTED) -- see app_chanspy");
Index: addons/app_saycountpl.c
===================================================================
--- addons/app_saycountpl.c	(revision 313649)
+++ addons/app_saycountpl.c	(working copy)
@@ -133,4 +133,4 @@
 	return res ? AST_MODULE_LOAD_DECLINE : AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Say polish counting words");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Say polish counting words (UNSUPPORTED) -- integrated in say.conf");
Index: addons/app_mysql.c
===================================================================
--- addons/app_mysql.c	(revision 313649)
+++ addons/app_mysql.c	(working copy)
@@ -623,4 +623,4 @@
 	return ast_register_application(app, MYSQL_exec, synopsis, descrip);
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Simple Mysql Interface");
+AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Simple Mysql Interface (UNSUPPORTED) -- see func_odbc");
Index: addons/cdr_mysql.c
===================================================================
--- addons/cdr_mysql.c	(revision 313649)
+++ addons/cdr_mysql.c	(working copy)
@@ -680,7 +680,7 @@
 	return ret;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MySQL CDR Backend",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "MySQL CDR Backend (UNSUPPORTED) -- see cdr_adaptive_odbc",
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,