Index: apps/app_settransfercapability.c
===================================================================
--- apps/app_settransfercapability.c	(revision 30327)
+++ apps/app_settransfercapability.c	(working copy)
@@ -76,9 +76,15 @@
 	int x;
 	char *opts;
 	int transfercapability = -1;
+	static int dep_warning = 0;
 	
 	LOCAL_USER_ADD(u);
-	
+
+	if (!dep_warning) {
+		dep_warning = 1;
+		ast_log(LOG_WARNING, "SetTransferCapability is deprecated.  Please use CHANNEL(transfercapability) instead.\n");
+	}
+
 	if (data)
 		tmp = ast_strdupa(data);
 	else
Index: apps/app_setcdruserfield.c
===================================================================
--- apps/app_setcdruserfield.c	(revision 30327)
+++ apps/app_setcdruserfield.c	(working copy)
@@ -109,6 +109,7 @@
 {
 	struct localuser *u;
 	int res = 0;
+	static int dep_warning = 0;
 	
 	LOCAL_USER_ADD(u);
 
@@ -116,6 +117,11 @@
 		ast_cdr_setuserfield(chan, (char*)data);
 	}
 
+	if (!dep_warning) {
+		dep_warning = 1;
+		ast_log(LOG_WARNING, "SetCDRUserField is deprecated.  Please use CDR(userfield) instead.\n");
+	}
+
 	LOCAL_USER_REMOVE(u);
 	
 	return res;
@@ -125,6 +131,7 @@
 {
 	struct localuser *u;
 	int res = 0;
+	static int dep_warning = 0;
 	
 	LOCAL_USER_ADD(u);
 
@@ -132,6 +139,11 @@
 		ast_cdr_appenduserfield(chan, (char*)data);
 	}
 
+	if (!dep_warning) {
+		dep_warning = 1;
+		ast_log(LOG_WARNING, "AppendCDRUserField is deprecated.  Please use CDR(userfield) instead.\n");
+	}
+
 	LOCAL_USER_REMOVE(u);
 	
 	return res;
Index: apps/app_lookupcidname.c
===================================================================
--- apps/app_lookupcidname.c	(revision 30327)
+++ apps/app_lookupcidname.c	(working copy)
@@ -66,8 +66,13 @@
 {
   char dbname[64];
   struct localuser *u;
+	static int dep_warning = 0;
 
   LOCAL_USER_ADD (u);
+	if (!dep_warning) {
+		dep_warning = 1;
+		ast_log(LOG_WARNING, "LookupCIDName is deprecated.  Please use ${DB(cidname/${CALLERID(num)})} instead.\n");
+	}
   if (chan->cid.cid_num) {
 	if (!ast_db_get ("cidname", chan->cid.cid_num, dbname, sizeof (dbname))) {
 		ast_set_callerid (chan, NULL, dbname, NULL);
Index: apps/app_lookupblacklist.c
===================================================================
--- apps/app_lookupblacklist.c	(revision 30327)
+++ apps/app_lookupblacklist.c	(working copy)
@@ -65,6 +65,32 @@
 
 LOCAL_USER_DECL;
 
+static int blacklist_read(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len)
+{
+	char blacklist[1];
+	int bl = 0;
+
+	if (chan->cid.cid_num) {
+		if (!ast_db_get("blacklist", chan->cid.cid_num, blacklist, sizeof (blacklist)))
+			bl = 1;
+	}
+	if (chan->cid.cid_name) {
+		if (!ast_db_get("blacklist", chan->cid.cid_name, blacklist, sizeof (blacklist)))
+			bl = 1;
+	}
+
+	snprintf(buf, len, "%d", bl);
+	return 0;
+}
+
+static struct ast_custom_function blacklist_function = {
+	.name = "BLACKLIST",
+	.synopsis = "Check if the callerid is on the blacklist",
+	.desc = "Uses astdb to check if the Caller*ID is in family 'blacklist'.  Returns 1 or 0.\n",
+	.syntax = "BLACKLIST()",
+	.read = blacklist_read,
+};
+
 static int
 lookupblacklist_exec (struct ast_channel *chan, void *data)
 {
@@ -72,9 +98,15 @@
 	struct localuser *u;
 	int bl = 0;
 	int priority_jump = 0;
+	static int dep_warning = 0;
 
 	LOCAL_USER_ADD(u);
 
+	if (!dep_warning) {
+		dep_warning = 1;
+		ast_log(LOG_WARNING, "LookupBlacklist is deprecated.  Please use ${BLACKLIST()} instead.\n");
+	}
+
 	if (!ast_strlen_zero(data)) {
 		if (strchr(data, 'j'))
 			priority_jump = 1;
@@ -112,6 +144,7 @@
 	int res;
 
 	res = ast_unregister_application(app);
+	res |= ast_custom_function_unregister(&blacklist_function);
 
 	STANDARD_HANGUP_LOCALUSERS;
 
@@ -120,7 +153,9 @@
 
 static int load_module(void *mod)
 {
-	return ast_register_application (app, lookupblacklist_exec, synopsis,descrip);
+	int res = ast_custom_function_register(&blacklist_function);
+	res |= ast_register_application (app, lookupblacklist_exec, synopsis,descrip);
+	return res;
 }
 
 static const char *description(void)
Index: funcs/func_channel.c
===================================================================
--- funcs/func_channel.c	(revision 30327)
+++ funcs/func_channel.c	(working copy)
@@ -51,6 +51,12 @@
 		ast_channel_unlock(chan); \
 	} while (0)
 
+char *transfercapability_table[0x20] = {
+	"SPEECH", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK",
+	"DIGITAL", "RESTRICTED_DIGITAL", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK",
+	"3K1AUDIO", "DIGITAL_W_TONES", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK",
+	"VIDEO", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK", "UNK", };
+
 static int func_channel_read(struct ast_channel *chan, char *function,
 			     char *data, char *buf, size_t len)
 {
@@ -78,6 +84,8 @@
 		locked_copy_string(chan, buf, ast_state2str(chan->_state), len);
 	else if (!strcasecmp(data, "channeltype"))
 		locked_copy_string(chan, buf, chan->tech->type, len);
+	else if (!strcasecmp(data, "transfercapability"))
+		locked_copy_string(chan, buf, transfercapability_table[chan->transfercapability & 0x1f], len);
 	else if (!strcasecmp(data, "callgroup")) {
 		char groupbuf[256];
 		locked_copy_string(chan, buf,  ast_print_group(groupbuf, sizeof(groupbuf), chan->callgroup), len);
@@ -107,7 +115,15 @@
 		ast_channel_setoption(chan, AST_OPTION_TXGAIN, &gainset, sizeof(gainset), 0);
 	} else if (!strcasecmp(data, "rxgain")) {
 		sscanf(value, "%hhd", &gainset);
-		ast_channel_setoption(chan, AST_OPTION_RXGAIN, &gainset, sizeof(gainset), 0);	
+		ast_channel_setoption(chan, AST_OPTION_RXGAIN, &gainset, sizeof(gainset), 0);
+	} else if (!strcasecmp(data, "transfercapability")) {
+		unsigned short i;
+		for (i = 0; i < 0x20; i++) {
+			if (!strcasecmp(transfercapability_table[i], value) && strcmp(value, "UNK")) {
+				chan->transfercapability = i;
+				break;
+			}
+		}
 	} else if (!chan->tech->func_channel_write
 		 || chan->tech->func_channel_write(chan, function, data, value)) {
 		ast_log(LOG_WARNING, "Unknown or unavailable item requested: '%s'\n",