diff --git a/Makefile b/Makefile
index a4708d1..dfc53df 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,7 @@ SHAREDOS=chan_capi.so
 OBJECTS=chan_capi.o chan_capi_utils.o chan_capi_rtp.o chan_capi_command.o xlaw.o dlist.o	\
 	chan_capi_qsig_core.o chan_capi_qsig_ecma.o chan_capi_qsig_asn197ade.o	\
 	chan_capi_qsig_asn197no.o chan_capi_supplementary.o chan_capi_chat.o \
-	chan_capi_mwi.o
+	chan_capi_mwi.o chan_capi_cli.o
 
 ifeq (${USE_OWN_LIBCAPI},yes)
 OBJECTS += libcapi20/convert.o libcapi20/capi20.o libcapi20/capifunc.o
diff --git a/chan_capi.c b/chan_capi.c
index 047c8f7..4aed0c0 100644
--- a/chan_capi.c
+++ b/chan_capi.c
@@ -55,6 +55,7 @@ struct _diva_streaming_vector* vind;
 #include "divastatus_ifc.h"
 #endif
 #include "chan_capi_mwi.h"
+#include "chan_capi_cli.h"
 
 /* #define CC_VERSION "x.y.z" */
 #define CC_VERSION "$Revision$"
@@ -7878,426 +7879,6 @@ static void supported_sservices(struct cc_capi_controller *cp)
 	return;
 }
 
-/*
- * helper functions to convert conf value to string
- */
-static char *show_bproto(int bproto)
-{
-	switch(bproto) {
-	case CC_BPROTO_TRANSPARENT:
-		return "trans";
-	case CC_BPROTO_FAXG3:
-	case CC_BPROTO_FAX3_BASIC:
-		return " fax ";
-	case CC_BPROTO_RTP:
-		return " rtp ";
-	case CC_BPROTO_VOCODER:
-		return " vocoder ";
-	}
-	return " ??? ";
-}
-static char *show_state(int state)
-{
-	switch(state) {
-	case CAPI_STATE_ALERTING:
-		return "Ring ";
-	case CAPI_STATE_CONNECTED:
-		return "Conn ";
-	case CAPI_STATE_DISCONNECTING:
-		return "discP";
-	case CAPI_STATE_DISCONNECTED:
-		return "Disc ";
-	case CAPI_STATE_CONNECTPENDING:
-		return "Dial ";
-	case CAPI_STATE_ANSWERING:
-		return "Answ ";
-	case CAPI_STATE_DID:
-		return "DIDin";
-	case CAPI_STATE_INCALL:
-		return "icall";
-	case CAPI_STATE_ONHOLD:
-		return "Hold ";
-	}
-	return "-----";
-}
-static char *show_isdnstate(unsigned int isdnstate, char *str)
-{
-	str[0] = '\0';
-
-	if (isdnstate & CAPI_ISDN_STATE_PBX)
-		strcat(str, "*");
-	if (isdnstate & CAPI_ISDN_STATE_LI)
-		strcat(str, "G");
-	if (isdnstate & CAPI_ISDN_STATE_B3_UP)
-		strcat(str, "B");
-	if (isdnstate & CAPI_ISDN_STATE_B3_PEND)
-		strcat(str, "b");
-	if (isdnstate & CAPI_ISDN_STATE_PROGRESS)
-		strcat(str, "P");
-	if (isdnstate & CAPI_ISDN_STATE_HOLD)
-		strcat(str, "H");
-	if (isdnstate & CAPI_ISDN_STATE_ECT)
-		strcat(str, "T");
-	if (isdnstate & CAPI_ISDN_STATE_3PTY)
-	        strcat(str, "3");
-	if (isdnstate & (CAPI_ISDN_STATE_SETUP | CAPI_ISDN_STATE_SETUP_ACK))
-		strcat(str, "S");
-
-	return str;
-}
-
-/*
- * usages
- */
-static char info_usage[] = 
-"Usage: " CC_MESSAGE_NAME " info\n"
-"       Show info about B channels on controllers.\n";
-
-static char show_channels_usage[] = 
-"Usage: " CC_MESSAGE_NAME " show channels\n"
-"       Show info about B channels.\n";
-
-static char debug_usage[] = 
-"Usage: " CC_MESSAGE_NAME " debug\n"
-"       Enables dumping of " CC_MESSAGE_BIGNAME " packets for debugging purposes\n";
-
-static char no_debug_usage[] = 
-"Usage: " CC_MESSAGE_NAME " no debug\n"
-"       Disables dumping of " CC_MESSAGE_BIGNAME " packets for debugging purposes\n";
-
-static char qsig_debug_usage[] = 
-"Usage: " CC_MESSAGE_NAME " qsig debug\n"
-"       Enables dumping of QSIG facilities for debugging purposes\n";
-
-static char qsig_no_debug_usage[] = 
-"Usage: " CC_MESSAGE_NAME " qsig no debug\n"
-"       Disables dumping of QSIG facilities for debugging purposes\n";
-
-#ifndef CC_AST_HAS_VERSION_1_6
-static
-#endif
-char chatinfo_usage[] = 
-"Usage: " CC_MESSAGE_NAME " chatinfo\n"
-"       Show info about chat status.\n";
-
-#define CC_CLI_TEXT_INFO "Show " CC_MESSAGE_BIGNAME " info"
-#define CC_CLI_TEXT_SHOW_CHANNELS "Show B-channel info"
-#define CC_CLI_TEXT_DEBUG "Enable " CC_MESSAGE_BIGNAME " debugging"
-#define CC_CLI_TEXT_NO_DEBUG "Disable " CC_MESSAGE_BIGNAME " debugging"
-#define CC_CLI_TEXT_QSIG_DEBUG "Enable QSIG debugging"
-#define CC_CLI_TEXT_QSIG_NO_DEBUG "Disable QSIG debugging"
-#define CC_CLI_TEXT_CHATINFO "Show " CC_MESSAGE_BIGNAME " chat info"
-
-/*
- * do command capi show channels
- */
-#ifdef CC_AST_HAS_VERSION_1_6
-static char *pbxcli_capi_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-#else
-static int pbxcli_capi_show_channels(int fd, int argc, char *argv[])
-#endif
-{
-	struct capi_pvt *i;
-	char iochar;
-	char i_state[80];
-	char b3q[32];
-	int required_args;
-	int provided_args;
-	const char* required_channel_name = NULL;
-
-#ifdef CC_AST_HAS_VERSION_1_6
-	int fd = a->fd;
-
-	if (cmd == CLI_INIT) {
-		e->command = CC_MESSAGE_NAME " show channels";
-		e->usage = show_channels_usage;
-		return NULL;
-	} else if (cmd == CLI_GENERATE)
-		return NULL;
-	required_args = e->args;
-	provided_args = a->argc;
-	if (required_args < provided_args) {
-		required_channel_name = a->argv[required_args];
-	}
-#else
-	required_args = 3;
-	provided_args = argc;
-	if (required_args < provided_args) {
-		required_channel_name = argv[required_args];
-	}
-#endif
-
-	ast_cli(fd, CC_MESSAGE_BIGNAME " B-channel information:\n");
-	ast_cli(fd, "Line-Name       NTmode state i/o bproto isdnstate   ton  number\n");
-	ast_cli(fd, "----------------------------------------------------------------\n");
-
-	cc_mutex_lock(&iflock);
-
-	for (i = capi_iflist; i; i = i->next) {
-		if (i->channeltype != CAPI_CHANNELTYPE_B)
-			continue;
-		if ((required_channel_name != NULL) && (strcmp(required_channel_name, i->vname) != 0))
-			continue;
-
-		if ((i->state == 0) || (i->state == CAPI_STATE_DISCONNECTED))
-			iochar = '-';
-		else if (i->outgoing)
-			iochar = 'O';
-		else
-			iochar = 'I';
-
-		if (capidebug) {
-			snprintf(b3q, sizeof(b3q), "  B3q=%d B3count=%d",
-				i->B3q, i->B3count);
-		} else {
-			b3q[0] = '\0';
-		}
-
-		ast_cli(fd,
-			"%-16s %s   %s  %c  %s  %-10s  0x%02x '%s'->'%s'%s\n",
-			i->vname,
-			i->ntmode ? "yes":"no ",
-			show_state(i->state),
-			iochar,
-			show_bproto(i->bproto),
-			show_isdnstate(i->isdnstate, i_state),
-			i->cid_ton,
-			i->cid,
-			i->dnid,
-			b3q
-		);
-	}
-
-	cc_mutex_unlock(&iflock);
-		
-#ifdef CC_AST_HAS_VERSION_1_6
-	return CLI_SUCCESS;
-#else
-	return RESULT_SUCCESS;
-#endif
-}
-
-/*
- * do command capi info
- */
-#ifdef CC_AST_HAS_VERSION_1_6
-static char *pbxcli_capi_info(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-#else
-static int pbxcli_capi_info(int fd, int argc, char *argv[])
-#endif
-{
-	int i = 0;
-#ifdef CC_AST_HAS_VERSION_1_6
-	int fd = a->fd;
-
-	if (cmd == CLI_INIT) {
-		e->command = CC_MESSAGE_NAME " info";
-		e->usage = info_usage;
-		return NULL;
-	} else if (cmd == CLI_GENERATE)
-		return NULL;
-	if (a->argc != e->args)
-		return CLI_SHOWUSAGE;
-#else
-	
-	if (argc != 2)
-		return RESULT_SHOWUSAGE;
-#endif
-	
-	ast_cli(fd, "%s www.chan-capi.org\n", tdesc);
-		
-	for (i = 1; i <= capi_num_controllers; i++) {
-		if (capi_controllers[i] != NULL) {
-			ast_cli(fd, "Contr%d: %d B channels total, %d B channels free.%s\n",
-				i, capi_controllers[i]->nbchannels,
-				capi_controllers[i]->nfreebchannels,
-				(capi_controllers[i]->used) ? "":" (unused)");
-		}
-	}
-#ifdef CC_AST_HAS_VERSION_1_6
-	return CLI_SUCCESS;
-#else
-	return RESULT_SUCCESS;
-#endif
-}
-
-/*
- * enable debugging
- */
-#ifdef CC_AST_HAS_VERSION_1_6
-static char *pbxcli_capi_do_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-#else
-static int pbxcli_capi_do_debug(int fd, int argc, char *argv[])
-#endif
-{
-#ifdef CC_AST_HAS_VERSION_1_6
-	int fd = a->fd;
-
-	if (cmd == CLI_INIT) {
-		e->command = CC_MESSAGE_NAME " debug";
-		e->usage = debug_usage;
-		return NULL;
-	} else if (cmd == CLI_GENERATE)
-		return NULL;
-	if (a->argc != e->args)
-		return CLI_SHOWUSAGE;
-#else
-	if (argc != 2)
-		return RESULT_SHOWUSAGE;
-#endif
-		
-	capidebug = 1;
-	ast_cli(fd, CC_MESSAGE_BIGNAME " Message Debugging Enabled\n");
-	
-#ifdef CC_AST_HAS_VERSION_1_6
-	return CLI_SUCCESS;
-#else
-	return RESULT_SUCCESS;
-#endif
-}
-
-/*
- * disable debugging
- */
-#ifdef CC_AST_HAS_VERSION_1_6
-static char *pbxcli_capi_no_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-#else
-static int pbxcli_capi_no_debug(int fd, int argc, char *argv[])
-#endif
-{
-#ifdef CC_AST_HAS_VERSION_1_6
-	int fd = a->fd;
-
-	if (cmd == CLI_INIT) {
-		e->command = CC_MESSAGE_NAME " no debug";
-		e->usage = no_debug_usage;
-		return NULL;
-	} else if (cmd == CLI_GENERATE)
-		return NULL;
-	if (a->argc != e->args)
-		return CLI_SHOWUSAGE;
-#else
-	if (argc != 3)
-		return RESULT_SHOWUSAGE;
-#endif
-
-	capidebug = 0;
-	ast_cli(fd, CC_MESSAGE_BIGNAME " Message Debugging Disabled\n");
-	
-#ifdef CC_AST_HAS_VERSION_1_6
-	return CLI_SUCCESS;
-#else
-	return RESULT_SUCCESS;
-#endif
-}
-
-/*
- * enable QSIG debugging
- */
-#ifdef CC_AST_HAS_VERSION_1_6
-static char *pbxcli_capi_qsig_do_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-#else
-static int pbxcli_capi_qsig_do_debug(int fd, int argc, char *argv[])
-#endif
-{
-#ifdef CC_AST_HAS_VERSION_1_6
-	int fd = a->fd;
-
-	if (cmd == CLI_INIT) {
-		e->command = CC_MESSAGE_NAME " qsig debug";
-		e->usage = qsig_debug_usage;
-		return NULL;
-	} else if (cmd == CLI_GENERATE)
-		return NULL;
-	if (a->argc != e->args)
-		return CLI_SHOWUSAGE;
-#else
-	if (argc != 3)
-		return RESULT_SHOWUSAGE;
-#endif
-		
-	capiqsigdebug = 1;
-	ast_cli(fd, "QSIG Debugging Enabled\n");
-	
-#ifdef CC_AST_HAS_VERSION_1_6
-	return CLI_SUCCESS;
-#else
-	return RESULT_SUCCESS;
-#endif
-}
-
-/*
- * disable QSIG debugging
- */
-#ifdef CC_AST_HAS_VERSION_1_6
-static char *pbxcli_capi_qsig_no_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
-#else
-static int pbxcli_capi_qsig_no_debug(int fd, int argc, char *argv[])
-#endif
-{
-#ifdef CC_AST_HAS_VERSION_1_6
-	int fd = a->fd;
-
-	if (cmd == CLI_INIT) {
-		e->command = CC_MESSAGE_NAME " qsig no debug";
-		e->usage = qsig_no_debug_usage;
-		return NULL;
-	} else if (cmd == CLI_GENERATE)
-		return NULL;
-	if (a->argc != e->args)
-		return CLI_SHOWUSAGE;
-#else
-	if (argc != 4)
-		return RESULT_SHOWUSAGE;
-#endif
-
-	capiqsigdebug = 0;
-	ast_cli(fd, "QSIG Debugging Disabled\n");
-	
-#ifdef CC_AST_HAS_VERSION_1_6
-	return CLI_SUCCESS;
-#else
-	return RESULT_SUCCESS;
-#endif
-}
-
-/*
- * define commands
- */
-#ifdef CC_AST_HAS_VERSION_1_6
-static struct ast_cli_entry cc_cli_cmd[] = {
-	AST_CLI_DEFINE(pbxcli_capi_info, CC_CLI_TEXT_INFO),
-	AST_CLI_DEFINE(pbxcli_capi_show_channels, CC_CLI_TEXT_SHOW_CHANNELS),
-	AST_CLI_DEFINE(pbxcli_capi_do_debug, CC_CLI_TEXT_DEBUG),
-	AST_CLI_DEFINE(pbxcli_capi_no_debug, CC_CLI_TEXT_NO_DEBUG),
-	AST_CLI_DEFINE(pbxcli_capi_qsig_do_debug, CC_CLI_TEXT_QSIG_DEBUG),
-	AST_CLI_DEFINE(pbxcli_capi_qsig_no_debug, CC_CLI_TEXT_QSIG_NO_DEBUG),
-	AST_CLI_DEFINE(pbxcli_capi_chatinfo, CC_CLI_TEXT_CHATINFO),
-#ifdef DIVA_STATUS
-	AST_CLI_DEFINE(pbxcli_capi_ifc_status, CC_CLI_TEXT_IFC_STATUSINFO),
-#endif
-};
-#else
-static struct ast_cli_entry  cli_info =
-	{ { CC_MESSAGE_NAME, "info", NULL }, pbxcli_capi_info, CC_CLI_TEXT_INFO, info_usage };
-static struct ast_cli_entry  cli_show_channels =
-	{ { CC_MESSAGE_NAME, "show", "channels", NULL }, pbxcli_capi_show_channels, CC_CLI_TEXT_SHOW_CHANNELS, show_channels_usage };
-static struct ast_cli_entry  cli_debug =
-	{ { CC_MESSAGE_NAME, "debug", NULL }, pbxcli_capi_do_debug, CC_CLI_TEXT_DEBUG, debug_usage };
-static struct ast_cli_entry  cli_no_debug =
-	{ { CC_MESSAGE_NAME, "no", "debug", NULL }, pbxcli_capi_no_debug, CC_CLI_TEXT_NO_DEBUG, no_debug_usage };
-static struct ast_cli_entry  cli_qsig_debug =
-	{ { CC_MESSAGE_NAME, "qsig", "debug", NULL }, pbxcli_capi_qsig_do_debug, CC_CLI_TEXT_QSIG_DEBUG, qsig_debug_usage };
-static struct ast_cli_entry  cli_qsig_no_debug =
-	{ { CC_MESSAGE_NAME, "qsig", "no", "debug", NULL }, pbxcli_capi_qsig_no_debug, CC_CLI_TEXT_QSIG_NO_DEBUG, qsig_no_debug_usage };
-static struct ast_cli_entry  cli_chatinfo =
-	{ { CC_MESSAGE_NAME, "chatinfo", NULL }, pbxcli_capi_chatinfo, CC_CLI_TEXT_CHATINFO, chatinfo_usage };
-#ifdef DIVA_STATUS
-static struct ast_cli_entry  cli_ifcstate =
-	{ { CC_MESSAGE_NAME, "ifcstate", NULL }, pbxcli_capi_ifc_status, CC_CLI_TEXT_IFC_STATUSINFO, diva_status_ifc_state_usage };
-#endif
-#endif
-
 const struct ast_channel_tech capi_tech = {
 	.type = channeltype,
 	.description = tdesc,
@@ -8928,20 +8509,7 @@ int unload_module(void)
 
 	ast_unregister_application(commandapp);
 
-#ifdef CC_AST_HAS_VERSION_1_6
-	ast_cli_unregister_multiple(cc_cli_cmd, sizeof(cc_cli_cmd)/ sizeof(struct ast_cli_entry));
-#else
-	ast_cli_unregister(&cli_info);
-	ast_cli_unregister(&cli_show_channels);
-	ast_cli_unregister(&cli_debug);
-	ast_cli_unregister(&cli_no_debug);
-	ast_cli_unregister(&cli_qsig_debug);
-	ast_cli_unregister(&cli_qsig_no_debug);
-	ast_cli_unregister(&cli_chatinfo);
-#ifdef DIVA_STATUS
-	ast_cli_unregister(&cli_ifcstate);
-#endif
-#endif
+	pbx_capi_cli_unregister();
 
 #ifdef CC_AST_HAS_VERSION_1_4
 	ast_module_user_hangup_all();
@@ -9054,20 +8622,7 @@ int load_module(void)
 		return -1;
 	}
 
-#ifdef CC_AST_HAS_VERSION_1_6
-	ast_cli_register_multiple(cc_cli_cmd, sizeof(cc_cli_cmd)/ sizeof(struct ast_cli_entry));
-#else
-	ast_cli_register(&cli_info);
-	ast_cli_register(&cli_show_channels);
-	ast_cli_register(&cli_debug);
-	ast_cli_register(&cli_no_debug);
-	ast_cli_register(&cli_qsig_debug);
-	ast_cli_register(&cli_qsig_no_debug);
-	ast_cli_register(&cli_chatinfo);
-#ifdef DIVA_STATUS
-	ast_cli_register(&cli_ifcstate);
-#endif
-#endif
+	pbx_capi_cli_register();
 	
 	ast_register_application(commandapp, pbx_capicommand_exec, commandsynopsis, commandtdesc);
 
@@ -9170,10 +8725,16 @@ cc_format_t pbx_capi_get_controller_codecs(int controller)
 	return (capi_controllers[controller]->rtpcodec);
 }
 
-const struct cc_capi_controller *pbx_capi_get_controller (int controller) {
+const struct cc_capi_controller *pbx_capi_get_controller(int controller)
+{
 	return ((controller > 0 && controller <= capi_num_controllers) ? capi_controllers[controller] : 0);
 }
 
+int pbx_capi_get_num_controllers(void)
+{
+	return capi_num_controllers;
+}
+
 #ifdef DIVA_STATUS
 /*!
 	\brief Notify about interface state change
@@ -9238,3 +8799,18 @@ static int pbx_capi_check_controller_status(int capiController)
 	return 1;
 }
 
+const char* pbx_capi_get_module_description(void)
+{
+	return tdesc;
+}
+
+void pbx_capi_lock_interfaces(void)
+{
+	cc_mutex_lock(&iflock);
+}
+
+void pbx_capi_unlock_interfaces(void)
+{
+	cc_mutex_unlock(&iflock);
+}
+
diff --git a/chan_capi.h b/chan_capi.h
index b94d4d3..934ec61 100644
--- a/chan_capi.h
+++ b/chan_capi.h
@@ -782,9 +782,28 @@ pbx_capi_command_proc_t pbx_capi_lockup_command_by_name(const char* name);
 /*!
  * \brief returns list of supported by this controller RTP codecs
  */
-cc_format_t pbx_capi_get_controller_codecs (int controller);
-_cstruct diva_get_b1_conf (struct capi_pvt *i);
-const struct cc_capi_controller *pbx_capi_get_controller (int controller);
+cc_format_t pbx_capi_get_controller_codecs(int controller);
+_cstruct diva_get_b1_conf(struct capi_pvt *i);
+/*!
+	\brief &capi_controllers[controller]
+	*/
+const struct cc_capi_controller *pbx_capi_get_controller(int controller);
+/*!
+	\brief capi_num_controllers
+	*/
+int pbx_capi_get_num_controllers(void);
+/*!
+	\brief tdesc
+	*/
+const char* pbx_capi_get_module_description(void);
+/*!
+	\brief cc_mutex_lock(&iflock)
+	*/
+void pbx_capi_lock_interfaces(void);
+/*!
+	\brief cc_mutex_unlock(&iflock)
+	*/
+void pbx_capi_unlock_interfaces(void);
 
 #ifdef DIVA_STREAMING
 struct _diva_streaming_vector;
diff --git a/chan_capi_cli.c b/chan_capi_cli.c
new file mode 100644
index 0000000..f6de90e
--- /dev/null
+++ b/chan_capi_cli.c
@@ -0,0 +1,487 @@
+/*
+ * An implementation of Common ISDN API 2.0 for Asterisk
+ *
+ * Copyright (C) 2005-2010 Cytronics & Melware
+ *
+ * Armin Schindler <armin@melware.de>
+ * 
+ * Reworked, but based on the work of
+ * Copyright (C) 2002-2005 Junghanns.NET GmbH
+ *
+ * Klaus-Peter Junghanns <kapejod@ns1.jnetdns.de>
+ *
+ * This program is free software and may be modified and 
+ * distributed under the terms of the GNU Public License.
+ */
+
+#include "chan_capi_platform.h"
+#include "chan_capi20.h"
+#include "chan_capi.h"
+#include "chan_capi_qsig.h"
+#include "chan_capi_utils.h"
+#include "chan_capi_chat.h"
+#include "chan_capi_cli.h"
+#ifdef DIVA_STATUS
+#include "divastatus_ifc.h"
+#endif
+
+/*
+ * usages
+ */
+static char info_usage[] = 
+"Usage: " CC_MESSAGE_NAME " info\n"
+"       Show info about B channels on controllers.\n";
+
+static char show_channels_usage[] = 
+"Usage: " CC_MESSAGE_NAME " show channels\n"
+"       Show info about B channels.\n";
+
+static char debug_usage[] = 
+"Usage: " CC_MESSAGE_NAME " debug\n"
+"       Enables dumping of " CC_MESSAGE_BIGNAME " packets for debugging purposes\n";
+
+static char no_debug_usage[] = 
+"Usage: " CC_MESSAGE_NAME " no debug\n"
+"       Disables dumping of " CC_MESSAGE_BIGNAME " packets for debugging purposes\n";
+
+static char qsig_debug_usage[] = 
+"Usage: " CC_MESSAGE_NAME " qsig debug\n"
+"       Enables dumping of QSIG facilities for debugging purposes\n";
+
+static char qsig_no_debug_usage[] = 
+"Usage: " CC_MESSAGE_NAME " qsig no debug\n"
+"       Disables dumping of QSIG facilities for debugging purposes\n";
+
+#ifndef CC_AST_HAS_VERSION_1_6
+static
+#endif
+char chatinfo_usage[] = 
+"Usage: " CC_MESSAGE_NAME " chatinfo\n"
+"       Show info about chat status.\n";
+
+#define CC_CLI_TEXT_INFO "Show " CC_MESSAGE_BIGNAME " info"
+#define CC_CLI_TEXT_SHOW_CHANNELS "Show B-channel info"
+#define CC_CLI_TEXT_DEBUG "Enable " CC_MESSAGE_BIGNAME " debugging"
+#define CC_CLI_TEXT_NO_DEBUG "Disable " CC_MESSAGE_BIGNAME " debugging"
+#define CC_CLI_TEXT_QSIG_DEBUG "Enable QSIG debugging"
+#define CC_CLI_TEXT_QSIG_NO_DEBUG "Disable QSIG debugging"
+#define CC_CLI_TEXT_CHATINFO "Show " CC_MESSAGE_BIGNAME " chat info"
+
+/*
+ * helper functions to convert conf value to string
+ */
+static char *show_bproto(int bproto)
+{
+	switch(bproto) {
+	case CC_BPROTO_TRANSPARENT:
+		return "trans";
+	case CC_BPROTO_FAXG3:
+	case CC_BPROTO_FAX3_BASIC:
+		return " fax ";
+	case CC_BPROTO_RTP:
+		return " rtp ";
+	case CC_BPROTO_VOCODER:
+		return " vocoder ";
+	}
+	return " ??? ";
+}
+
+static char *show_state(int state)
+{
+	switch(state) {
+	case CAPI_STATE_ALERTING:
+		return "Ring ";
+	case CAPI_STATE_CONNECTED:
+		return "Conn ";
+	case CAPI_STATE_DISCONNECTING:
+		return "discP";
+	case CAPI_STATE_DISCONNECTED:
+		return "Disc ";
+	case CAPI_STATE_CONNECTPENDING:
+		return "Dial ";
+	case CAPI_STATE_ANSWERING:
+		return "Answ ";
+	case CAPI_STATE_DID:
+		return "DIDin";
+	case CAPI_STATE_INCALL:
+		return "icall";
+	case CAPI_STATE_ONHOLD:
+		return "Hold ";
+	}
+	return "-----";
+}
+
+static char *show_isdnstate(unsigned int isdnstate, char *str)
+{
+	str[0] = '\0';
+
+	if (isdnstate & CAPI_ISDN_STATE_PBX)
+		strcat(str, "*");
+	if (isdnstate & CAPI_ISDN_STATE_LI)
+		strcat(str, "G");
+	if (isdnstate & CAPI_ISDN_STATE_B3_UP)
+		strcat(str, "B");
+	if (isdnstate & CAPI_ISDN_STATE_B3_PEND)
+		strcat(str, "b");
+	if (isdnstate & CAPI_ISDN_STATE_PROGRESS)
+		strcat(str, "P");
+	if (isdnstate & CAPI_ISDN_STATE_HOLD)
+		strcat(str, "H");
+	if (isdnstate & CAPI_ISDN_STATE_ECT)
+		strcat(str, "T");
+	if (isdnstate & CAPI_ISDN_STATE_3PTY)
+	        strcat(str, "3");
+	if (isdnstate & (CAPI_ISDN_STATE_SETUP | CAPI_ISDN_STATE_SETUP_ACK))
+		strcat(str, "S");
+
+	return str;
+}
+
+/*
+ * do command capi show channels
+ */
+#ifdef CC_AST_HAS_VERSION_1_6
+static char *pbxcli_capi_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+#else
+static int pbxcli_capi_show_channels(int fd, int argc, char *argv[])
+#endif
+{
+	struct capi_pvt *i;
+	char iochar;
+	char i_state[80];
+	char b3q[32];
+	int required_args;
+	int provided_args;
+	const char* required_channel_name = NULL;
+
+#ifdef CC_AST_HAS_VERSION_1_6
+	int fd = a->fd;
+
+	if (cmd == CLI_INIT) {
+		e->command = CC_MESSAGE_NAME " show channels";
+		e->usage = show_channels_usage;
+		return NULL;
+	} else if (cmd == CLI_GENERATE)
+		return NULL;
+	required_args = e->args;
+	provided_args = a->argc;
+	if (required_args < provided_args) {
+		required_channel_name = a->argv[required_args];
+	}
+#else
+	required_args = 3;
+	provided_args = argc;
+	if (required_args < provided_args) {
+		required_channel_name = argv[required_args];
+	}
+#endif
+
+	ast_cli(fd, CC_MESSAGE_BIGNAME " B-channel information:\n");
+	ast_cli(fd, "Line-Name       NTmode state i/o bproto isdnstate   ton  number\n");
+	ast_cli(fd, "----------------------------------------------------------------\n");
+
+	pbx_capi_lock_interfaces();
+
+	for (i = capi_iflist; i; i = i->next) {
+		if (i->channeltype != CAPI_CHANNELTYPE_B)
+			continue;
+		if ((required_channel_name != NULL) && (strcmp(required_channel_name, i->vname) != 0))
+			continue;
+
+		if ((i->state == 0) || (i->state == CAPI_STATE_DISCONNECTED))
+			iochar = '-';
+		else if (i->outgoing)
+			iochar = 'O';
+		else
+			iochar = 'I';
+
+		if (capidebug) {
+			snprintf(b3q, sizeof(b3q), "  B3q=%d B3count=%d",
+				i->B3q, i->B3count);
+		} else {
+			b3q[0] = '\0';
+		}
+
+		ast_cli(fd,
+			"%-16s %s   %s  %c  %s  %-10s  0x%02x '%s'->'%s'%s\n",
+			i->vname,
+			i->ntmode ? "yes":"no ",
+			show_state(i->state),
+			iochar,
+			show_bproto(i->bproto),
+			show_isdnstate(i->isdnstate, i_state),
+			i->cid_ton,
+			i->cid,
+			i->dnid,
+			b3q
+		);
+	}
+
+	pbx_capi_unlock_interfaces();
+
+#ifdef CC_AST_HAS_VERSION_1_6
+	return CLI_SUCCESS;
+#else
+	return RESULT_SUCCESS;
+#endif
+}
+
+/*
+ * do command capi info
+ */
+#ifdef CC_AST_HAS_VERSION_1_6
+static char *pbxcli_capi_info(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+#else
+static int pbxcli_capi_info(int fd, int argc, char *argv[])
+#endif
+{
+	int i = 0, capi_num_controllers = pbx_capi_get_num_controllers();
+#ifdef CC_AST_HAS_VERSION_1_6
+	int fd = a->fd;
+
+	if (cmd == CLI_INIT) {
+		e->command = CC_MESSAGE_NAME " info";
+		e->usage = info_usage;
+		return NULL;
+	} else if (cmd == CLI_GENERATE)
+		return NULL;
+	if (a->argc != e->args)
+		return CLI_SHOWUSAGE;
+#else
+	
+	if (argc != 2)
+		return RESULT_SHOWUSAGE;
+#endif
+	
+	ast_cli(fd, "%s www.chan-capi.org\n", pbx_capi_get_module_description());
+		
+	for (i = 1; i <= capi_num_controllers; i++) {
+		const struct cc_capi_controller *capiController = pbx_capi_get_controller(i);
+		if (capiController != NULL) {
+			ast_cli(fd, "Contr%d: %d B channels total, %d B channels free.%s\n",
+				i, capiController->nbchannels,
+				capiController->nfreebchannels,
+				(capiController->used) ? "":" (unused)");
+		}
+	}
+#ifdef CC_AST_HAS_VERSION_1_6
+	return CLI_SUCCESS;
+#else
+	return RESULT_SUCCESS;
+#endif
+}
+
+/*
+ * enable debugging
+ */
+#ifdef CC_AST_HAS_VERSION_1_6
+static char *pbxcli_capi_do_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+#else
+static int pbxcli_capi_do_debug(int fd, int argc, char *argv[])
+#endif
+{
+#ifdef CC_AST_HAS_VERSION_1_6
+	int fd = a->fd;
+
+	if (cmd == CLI_INIT) {
+		e->command = CC_MESSAGE_NAME " debug";
+		e->usage = debug_usage;
+		return NULL;
+	} else if (cmd == CLI_GENERATE)
+		return NULL;
+	if (a->argc != e->args)
+		return CLI_SHOWUSAGE;
+#else
+	if (argc != 2)
+		return RESULT_SHOWUSAGE;
+#endif
+		
+	capidebug = 1;
+	ast_cli(fd, CC_MESSAGE_BIGNAME " Message Debugging Enabled\n");
+	
+#ifdef CC_AST_HAS_VERSION_1_6
+	return CLI_SUCCESS;
+#else
+	return RESULT_SUCCESS;
+#endif
+}
+
+/*
+ * disable debugging
+ */
+#ifdef CC_AST_HAS_VERSION_1_6
+static char *pbxcli_capi_no_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+#else
+static int pbxcli_capi_no_debug(int fd, int argc, char *argv[])
+#endif
+{
+#ifdef CC_AST_HAS_VERSION_1_6
+	int fd = a->fd;
+
+	if (cmd == CLI_INIT) {
+		e->command = CC_MESSAGE_NAME " no debug";
+		e->usage = no_debug_usage;
+		return NULL;
+	} else if (cmd == CLI_GENERATE)
+		return NULL;
+	if (a->argc != e->args)
+		return CLI_SHOWUSAGE;
+#else
+	if (argc != 3)
+		return RESULT_SHOWUSAGE;
+#endif
+
+	capidebug = 0;
+	ast_cli(fd, CC_MESSAGE_BIGNAME " Message Debugging Disabled\n");
+	
+#ifdef CC_AST_HAS_VERSION_1_6
+	return CLI_SUCCESS;
+#else
+	return RESULT_SUCCESS;
+#endif
+}
+
+/*
+ * enable QSIG debugging
+ */
+#ifdef CC_AST_HAS_VERSION_1_6
+static char *pbxcli_capi_qsig_do_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+#else
+static int pbxcli_capi_qsig_do_debug(int fd, int argc, char *argv[])
+#endif
+{
+#ifdef CC_AST_HAS_VERSION_1_6
+	int fd = a->fd;
+
+	if (cmd == CLI_INIT) {
+		e->command = CC_MESSAGE_NAME " qsig debug";
+		e->usage = qsig_debug_usage;
+		return NULL;
+	} else if (cmd == CLI_GENERATE)
+		return NULL;
+	if (a->argc != e->args)
+		return CLI_SHOWUSAGE;
+#else
+	if (argc != 3)
+		return RESULT_SHOWUSAGE;
+#endif
+		
+	capiqsigdebug = 1;
+	ast_cli(fd, "QSIG Debugging Enabled\n");
+	
+#ifdef CC_AST_HAS_VERSION_1_6
+	return CLI_SUCCESS;
+#else
+	return RESULT_SUCCESS;
+#endif
+}
+
+/*
+ * disable QSIG debugging
+ */
+#ifdef CC_AST_HAS_VERSION_1_6
+static char *pbxcli_capi_qsig_no_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+#else
+static int pbxcli_capi_qsig_no_debug(int fd, int argc, char *argv[])
+#endif
+{
+#ifdef CC_AST_HAS_VERSION_1_6
+	int fd = a->fd;
+
+	if (cmd == CLI_INIT) {
+		e->command = CC_MESSAGE_NAME " qsig no debug";
+		e->usage = qsig_no_debug_usage;
+		return NULL;
+	} else if (cmd == CLI_GENERATE)
+		return NULL;
+	if (a->argc != e->args)
+		return CLI_SHOWUSAGE;
+#else
+	if (argc != 4)
+		return RESULT_SHOWUSAGE;
+#endif
+
+	capiqsigdebug = 0;
+	ast_cli(fd, "QSIG Debugging Disabled\n");
+	
+#ifdef CC_AST_HAS_VERSION_1_6
+	return CLI_SUCCESS;
+#else
+	return RESULT_SUCCESS;
+#endif
+}
+
+/*
+ * define commands
+ */
+#ifdef CC_AST_HAS_VERSION_1_6
+static struct ast_cli_entry cc_cli_cmd[] = {
+	AST_CLI_DEFINE(pbxcli_capi_info, CC_CLI_TEXT_INFO),
+	AST_CLI_DEFINE(pbxcli_capi_show_channels, CC_CLI_TEXT_SHOW_CHANNELS),
+	AST_CLI_DEFINE(pbxcli_capi_do_debug, CC_CLI_TEXT_DEBUG),
+	AST_CLI_DEFINE(pbxcli_capi_no_debug, CC_CLI_TEXT_NO_DEBUG),
+	AST_CLI_DEFINE(pbxcli_capi_qsig_do_debug, CC_CLI_TEXT_QSIG_DEBUG),
+	AST_CLI_DEFINE(pbxcli_capi_qsig_no_debug, CC_CLI_TEXT_QSIG_NO_DEBUG),
+	AST_CLI_DEFINE(pbxcli_capi_chatinfo, CC_CLI_TEXT_CHATINFO),
+#ifdef DIVA_STATUS
+	AST_CLI_DEFINE(pbxcli_capi_ifc_status, CC_CLI_TEXT_IFC_STATUSINFO),
+#endif
+};
+#else
+static struct ast_cli_entry  cli_info =
+	{ { CC_MESSAGE_NAME, "info", NULL }, pbxcli_capi_info, CC_CLI_TEXT_INFO, info_usage };
+static struct ast_cli_entry  cli_show_channels =
+	{ { CC_MESSAGE_NAME, "show", "channels", NULL }, pbxcli_capi_show_channels, CC_CLI_TEXT_SHOW_CHANNELS, show_channels_usage };
+static struct ast_cli_entry  cli_debug =
+	{ { CC_MESSAGE_NAME, "debug", NULL }, pbxcli_capi_do_debug, CC_CLI_TEXT_DEBUG, debug_usage };
+static struct ast_cli_entry  cli_no_debug =
+	{ { CC_MESSAGE_NAME, "no", "debug", NULL }, pbxcli_capi_no_debug, CC_CLI_TEXT_NO_DEBUG, no_debug_usage };
+static struct ast_cli_entry  cli_qsig_debug =
+	{ { CC_MESSAGE_NAME, "qsig", "debug", NULL }, pbxcli_capi_qsig_do_debug, CC_CLI_TEXT_QSIG_DEBUG, qsig_debug_usage };
+static struct ast_cli_entry  cli_qsig_no_debug =
+	{ { CC_MESSAGE_NAME, "qsig", "no", "debug", NULL }, pbxcli_capi_qsig_no_debug, CC_CLI_TEXT_QSIG_NO_DEBUG, qsig_no_debug_usage };
+static struct ast_cli_entry  cli_chatinfo =
+	{ { CC_MESSAGE_NAME, "chatinfo", NULL }, pbxcli_capi_chatinfo, CC_CLI_TEXT_CHATINFO, chatinfo_usage };
+#ifdef DIVA_STATUS
+static struct ast_cli_entry  cli_ifcstate =
+	{ { CC_MESSAGE_NAME, "ifcstate", NULL }, pbxcli_capi_ifc_status, CC_CLI_TEXT_IFC_STATUSINFO, diva_status_ifc_state_usage };
+#endif
+#endif
+
+
+
+void pbx_capi_cli_register(void)
+{
+#ifdef CC_AST_HAS_VERSION_1_6
+	ast_cli_register_multiple(cc_cli_cmd, sizeof(cc_cli_cmd)/ sizeof(struct ast_cli_entry));
+#else
+	ast_cli_register(&cli_info);
+	ast_cli_register(&cli_show_channels);
+	ast_cli_register(&cli_debug);
+	ast_cli_register(&cli_no_debug);
+	ast_cli_register(&cli_qsig_debug);
+	ast_cli_register(&cli_qsig_no_debug);
+	ast_cli_register(&cli_chatinfo);
+#ifdef DIVA_STATUS
+	ast_cli_register(&cli_ifcstate);
+#endif
+#endif
+}
+
+void pbx_capi_cli_unregister(void)
+{
+#ifdef CC_AST_HAS_VERSION_1_6
+	ast_cli_unregister_multiple(cc_cli_cmd, sizeof(cc_cli_cmd)/ sizeof(struct ast_cli_entry));
+#else
+	ast_cli_unregister(&cli_info);
+	ast_cli_unregister(&cli_show_channels);
+	ast_cli_unregister(&cli_debug);
+	ast_cli_unregister(&cli_no_debug);
+	ast_cli_unregister(&cli_qsig_debug);
+	ast_cli_unregister(&cli_qsig_no_debug);
+	ast_cli_unregister(&cli_chatinfo);
+#ifdef DIVA_STATUS
+	ast_cli_unregister(&cli_ifcstate);
+#endif
+#endif
+}
diff --git a/chan_capi_cli.h b/chan_capi_cli.h
new file mode 100644
index 0000000..ccadb0e
--- /dev/null
+++ b/chan_capi_cli.h
@@ -0,0 +1,10 @@
+#ifndef __CC_CLI_IFC_H__
+#define __CC_CLI_IFC_H__
+
+void pbx_capi_cli_register(void);
+void pbx_capi_cli_unregister(void);
+
+
+
+#endif
+
diff --git a/divastatus/divastatus.c b/divastatus/divastatus.c
index 72ffd19..53a9e4c 100644
--- a/divastatus/divastatus.c
+++ b/divastatus/divastatus.c
@@ -643,12 +643,12 @@ int pbxcli_capi_ifc_status(int fd, int argc, char *argv[])
 
 	ast_cli(fd, CC_MESSAGE_NAME " interfaces\n");
 	ast_cli(fd, "%s %-9s%-4s%-4s%-4s%-7s%-5s%8s%12s%12s%12s%12s\n",
-							"CAPI#", "State", "L1", "L2", "RED", "YELLOW", "BLUE", "D-Rx-Frames", "D-Rx-Bytes","D-Tx-Frames", "D-Tx-Bytes", "D-Errors");
+							"INTERFACE", "State", "L1", "L2", "RED", "YELLOW", "BLUE", "D-Rx-Frames", "D-Rx-Bytes","D-Tx-Frames", "D-Tx-Bytes", "D-Errors");
 
 	for (link = diva_q_get_head(&controller_q); link != 0; link = diva_q_get_next(link)) {
 		diva_status_ifc_t *controllerState = DIVAS_CONTAINING_RECORD(link, diva_status_ifc_t, link);
 		diva_status_ifc_state_t* state = &controllerState->state[controllerState->currentState];
-		ast_cli(fd, "%3d%-2s %-9s%-4s%-4s%-4s%-7s%-3s %12d %11d %11d %11d %11d\n",
+		ast_cli(fd, "ISDN%-3d%-2s %-9s%-4s%-4s%-4s%-7s%-3s %12d %11d %11d %11d %11d\n",
 						controllerState->capiController, "",
 						diva_status_interface_state_name(diva_status_get_interface_state_from_idi_state (state)),
 						((state->ifcType == DivaStatusIfcPri) && (state->hwState == DivaStatusHardwareStateOK)) ?