--- a/CMakeLists.txt	Tue May 03 02:30:09 2011 +0300
+++ b/CMakeLists.txt	Tue May 03 14:32:30 2011 +0300
@@ -69,10 +69,13 @@
 set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")
 include(CPack)
 
+configure_file(disco.avv.in disco.avv)
+
 ## Installation
 install(TARGETS disco DESTINATION lib/mcabber) 
 install(FILES disco.rc COPYING TODO README DESTINATION share/doc/${CPACK_PACKAGE_NAME})
 install(FILES disco.h DESTINATION include/mcabber)
 install(DIRECTORY help DESTINATION share/mcabber)
+install(FILES ${PROJECT_BINARY_DIR}/disco.avv DESTINATION share/mcabber/avv/modules RENAME disco)
 
 ## The End ## vim: se ts=4: ##

--- a/config.h.in	Tue May 03 02:30:09 2011 +0300
+++ b/config.h.in	Tue May 03 14:32:30 2011 +0300
@@ -4,12 +4,6 @@
 
 #cmakedefine HAVE_LM_CONNECTION_UNREGISTER_REPLY_HANDLER
 
-#include <mcabber/config.h>
-
-#if MCABBER_BRANCH_EXPERIMENTAL && MCABBER_API_VERSION >= 27
-#  define HAVE_CMD_ID
-#endif
-
 #define PROJECT_VERSION ( "${PROJECT_VERSION}" )
 
 #endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/disco.avv.in	Tue May 03 14:32:30 2011 +0300
@@ -0,0 +1,12 @@
+
+Name:        ${PROJECT_NAME}
+Method:      glib
+Version:     ${PROJECT_VERSION}
+Description: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
+# Right now it does not requires caps, but may require in future
+Requires:    modules:2 + commands:3 + compl:3 + logprint:3 + utils:2 +
+             xmpp:4 + xmpp_defines:1 + screen:3 + hbuf:1 + hooks:4
+Provides:    disco:1
+Init:        disco_init
+Uninit:      disco_uninit
+

--- a/disco.c	Tue May 03 02:30:09 2011 +0300
+++ b/disco.c	Tue May 03 14:32:30 2011 +0300
@@ -42,22 +42,11 @@
 // module description
 //
 
-static void disco_init   (void);
-static void disco_uninit (void);
+void disco_init   (void);
+void disco_uninit (void);
 
 #define DESCRIPTION ( "Service discovery requests\nProvides command /disco" )
 
-static module_info_t info_disco_experimental = {
-	.branch      = "experimental",
-	.api         = 27,
-	.version     = PROJECT_VERSION,
-	.description = DESCRIPTION,
-	.requires    = NULL,
-	.init        = disco_init,
-	.uninit      = disco_uninit,
-	.next        = NULL,
-};
-
 static module_info_t info_disco_dev = {
 	.branch      = "dev",
 	.api         = 13,
@@ -66,7 +55,7 @@
 	.requires    = NULL,
 	.init        = disco_init,
 	.uninit      = disco_uninit,
-	.next        = &info_disco_experimental,
+	.next        = NULL,
 };
 
 module_info_t info_disco = {
@@ -108,7 +97,7 @@
 // globals
 //
 
-#ifdef HAVE_CMD_ID
+#ifdef MCABBER_API_HAVE_CMD_ID
 static gpointer disco_cmid = NULL;
 #endif
 
@@ -648,7 +637,7 @@
 	return HOOK_HANDLER_RESULT_ALLOW_MORE_HANDLERS;
 }
 
-static void disco_init (void)
+void disco_init (void)
 {
 	// completion
 	disco_cid = compl_new_category ();
@@ -661,7 +650,7 @@
 	disco_hid = hk_add_handler (disco_hh, HOOK_PRE_DISCONNECT, G_PRIORITY_DEFAULT, NULL);
 
 	// command
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_add ("disco", "", disco_cid, COMPL_JID, do_disco, NULL);
 #else
 	disco_cmid = cmd_add ("disco", "", disco_cid, COMPL_JID, do_disco, NULL);
@@ -670,10 +659,10 @@
 	return;
 }
 
-static void disco_uninit (void)
+void disco_uninit (void)
 {
 	// command
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_del ("disco");
 #else
 	if (disco_cmid)